fix(deps): Update eslint and prettier (#429)

openwhyd · Jan 23, 2021 · a4fe26b · a4fe26b
1 parent 06f7914
commit a4fe26b
Show file tree

Hide file tree

Showing 43 changed files with 2,507 additions and 2,588 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,7 @@
 public/js/*-min.js
 public/js/*.min.js
 public/js/*jquery*.js
+public/js/dropzone.js
 public/js/md5.js
 public/js/mustache.js
 public/js/playem-all.js

diff --git a/.prettierignore b/.prettierignore
@@ -4,6 +4,7 @@ CHANGELOG.md
 tipsy.css
 jquery*.js
 playem-all.js
+public/js/dropzone.js
 public/js/soundmanager2.js
 public/press/js/sliderz.v1.js
 docs/_site/*.html

diff --git a/app/controllers/LibUser.js b/app/controllers/LibUser.js
@@ -201,16 +201,17 @@ function renderFriends(friends) {
 }
 
 function populateUsers(subscr, options, cb) {
-  followModel.fetchSubscriptionArray(options.loggedUser.id, function (
-    mySubscr
-  ) {
-    var subscrSet = snip.arrayToSet(mySubscr);
-    for (let i in subscr)
-      if (subscrSet[subscr[i].id]) subscr[i].subscribed = true;
-    userModel.fetchUserBios(subscr, function () {
-      cb(renderFriends(subscr));
-    });
-  });
+  followModel.fetchSubscriptionArray(
+    options.loggedUser.id,
+    function (mySubscr) {
+      var subscrSet = snip.arrayToSet(mySubscr);
+      for (let i in subscr)
+        if (subscrSet[subscr[i].id]) subscr[i].subscribed = true;
+      userModel.fetchUserBios(subscr, function () {
+        cb(renderFriends(subscr));
+      });
+    }
+  );
 }
 
 function fetchAndRenderPlaylist(options, callback, process) {
@@ -292,45 +293,46 @@ function fetchAndRenderProfile(options, callback, process) {
     options.tabTitle = 'Activity';
     options.bodyClass += ' userActivity';
     options.pageTitle = options.user.name + "'s recent activity";
-    followModel.fetchUserSubscriptions(options.loggedUser.id, function (
-      mySubscr
-    ) {
-      //console.log("mySubscr.subscriptions", mySubscr.subscriptions);
-      var mySubscrUidList = snip.objArrayToValueArray(
-        mySubscr.subscriptions,
-        'id'
-      );
-      activityController.generateActivityFeed(
-        [options.user.id],
-        mySubscrUidList,
-        options,
-        function (result) {
-          for (let i in result.recentActivity.items)
-            if (result.recentActivity.items[i].subscriptions) {
-              result.recentActivity.items[i].subscribedUsers =
-                result.recentActivity.items[i].subscriptions;
-              delete result.recentActivity.items[i].subscriptions;
+    followModel.fetchUserSubscriptions(
+      options.loggedUser.id,
+      function (mySubscr) {
+        //console.log("mySubscr.subscriptions", mySubscr.subscriptions);
+        var mySubscrUidList = snip.objArrayToValueArray(
+          mySubscr.subscriptions,
+          'id'
+        );
+        activityController.generateActivityFeed(
+          [options.user.id],
+          mySubscrUidList,
+          options,
+          function (result) {
+            for (let i in result.recentActivity.items)
+              if (result.recentActivity.items[i].subscriptions) {
+                result.recentActivity.items[i].subscribedUsers =
+                  result.recentActivity.items[i].subscriptions;
+                delete result.recentActivity.items[i].subscriptions;
+              }
+            //console.log("ACTIVITY result", result.recentActivity);
+            options.showActivity = result.recentActivity;
+            if (result.hasMore)
+              options.hasMore = { lastPid: result.hasMore.last_id };
+            else {
+              var creation = mongodb.ObjectId(options.user.id);
+              options.showActivity.items.push({
+                _id: creation,
+                other: { text: 'joined whyd' },
+                //						ago: uiSnippets.renderTimestamp(new Date() - creation.getTimestamp())
+              });
             }
-          //console.log("ACTIVITY result", result.recentActivity);
-          options.showActivity = result.recentActivity;
-          if (result.hasMore)
-            options.hasMore = { lastPid: result.hasMore.last_id };
-          else {
-            var creation = mongodb.ObjectId(options.user.id);
-            options.showActivity.items.push({
-              _id: creation,
-              other: { text: 'joined whyd' },
-              //						ago: uiSnippets.renderTimestamp(new Date() - creation.getTimestamp())
-            });
+            for (let i in options.showActivity.items)
+              options.showActivity.items[i].ago = uiSnippets.renderTimestamp(
+                new Date() - options.showActivity.items[i]._id.getTimestamp()
+              );
+            process([]);
           }
-          for (let i in options.showActivity.items)
-            options.showActivity.items[i].ago = uiSnippets.renderTimestamp(
-              new Date() - options.showActivity.items[i]._id.getTimestamp()
-            );
-          process([]);
-        }
-      );
-    });
+        );
+      }
+    );
   } else if (options.showSubscribers) {
     options.tabTitle = 'Followers';
 

diff --git a/app/controllers/admin/analytics.js b/app/controllers/admin/analytics.js
@@ -187,15 +187,19 @@ exports.controller = function (request, reqParams, response) {
 
   var fetchPendingInvites = function (callback) {
     console.log('fetching invite collection...');
-    mongodb.collections['invite'].find({}, { limit: 999999 }, function (
-      err,
-      cursor
-    ) {
-      console.log('done fetching invite collection.');
-      cursor.toArray(function (err, items) {
-        callback('Number of pending invites', (pendingInvites = items).length);
-      });
-    });
+    mongodb.collections['invite'].find(
+      {},
+      { limit: 999999 },
+      function (err, cursor) {
+        console.log('done fetching invite collection.');
+        cursor.toArray(function (err, items) {
+          callback(
+            'Number of pending invites',
+            (pendingInvites = items).length
+          );
+        });
+      }
+    );
   };
 
   function countRecentInvites(cb) {

diff --git a/app/controllers/admin/recom.js b/app/controllers/admin/recom.js
@@ -259,25 +259,27 @@ var fileGenerators = {
       return [snip.normalizeArtistName(band)];
     });
     console.log('bands', bands);
-    recomModel.matchingEngine.fetchUsersByArtists(bands, null, function (
-      users
-    ) {
-      const processedUsers = snip.mapToObjArray(users).map(function (user) {
-        var artists = countOccurences(user.posted || []);
-        user.score = artists.length;
-        user.artists = artists
-          .map(function (artist) {
-            return artist.id + ' (' + artist.c + ')';
-          })
-          .join(', ');
-        delete user.posted;
-        return user;
-      });
-      processedUsers.sort(function (a, b) {
-        return b.score - a.score;
-      });
-      cb(processedUsers);
-    });
+    recomModel.matchingEngine.fetchUsersByArtists(
+      bands,
+      null,
+      function (users) {
+        const processedUsers = snip.mapToObjArray(users).map(function (user) {
+          var artists = countOccurences(user.posted || []);
+          user.score = artists.length;
+          user.artists = artists
+            .map(function (artist) {
+              return artist.id + ' (' + artist.c + ')';
+            })
+            .join(', ');
+          delete user.posted;
+          return user;
+        });
+        processedUsers.sort(function (a, b) {
+          return b.score - a.score;
+        });
+        cb(processedUsers);
+      }
+    );
   },
   'bandsToUsers.tsv': function (p, cb) {
     fileGenerators['bandsToUsers.json'](p, function (users) {

diff --git a/app/controllers/admin/tests/follow.js b/app/controllers/admin/tests/follow.js
@@ -11,31 +11,33 @@ exports.makeTests = function (p) {
       'fetchUserSubscriptions',
       function fetchSubscriptions(cb) {
         //console.time("fetchUserSubscriptions");
-        followModel.fetchUserSubscriptions(p.loggedUser.id, function (
-          subscriptions
-        ) {
-          testVars.uidList = [p.loggedUser.id];
-          for (let i in subscriptions.subscriptions)
-            if (subscriptions.subscriptions[i].id)
-              testVars.uidList.push(
-                ('' + subscriptions.subscriptions[i].id).replace('/u/', '')
-              );
-          //console.timeEnd("fetchUserSubscriptions");
-          cb(true);
-        });
+        followModel.fetchUserSubscriptions(
+          p.loggedUser.id,
+          function (subscriptions) {
+            testVars.uidList = [p.loggedUser.id];
+            for (let i in subscriptions.subscriptions)
+              if (subscriptions.subscriptions[i].id)
+                testVars.uidList.push(
+                  ('' + subscriptions.subscriptions[i].id).replace('/u/', '')
+                );
+            //console.timeEnd("fetchUserSubscriptions");
+            cb(true);
+          }
+        );
       },
     ],
     [
       'fetchSubscriptionArray == fetchUserSubscriptions',
       function fetchSubscriptions(cb) {
         //console.time("fetchSubscriptionArray");
-        followModel.fetchSubscriptionArray(p.loggedUser.id, function (
-          subscriptions
-        ) {
-          subscriptions.push(p.loggedUser.id);
-          //console.timeEnd("fetchSubscriptionArray");
-          cb(subscriptions.sort().join() === testVars.uidList.sort().join());
-        });
+        followModel.fetchSubscriptionArray(
+          p.loggedUser.id,
+          function (subscriptions) {
+            subscriptions.push(p.loggedUser.id);
+            //console.timeEnd("fetchSubscriptionArray");
+            cb(subscriptions.sort().join() === testVars.uidList.sort().join());
+          }
+        );
       },
     ],
   ];

diff --git a/app/controllers/admin/tests/stream.js b/app/controllers/admin/tests/stream.js
@@ -21,13 +21,14 @@ exports.makeTests = function (p) {
       'fetchSubscriptionArray',
       function fetchSubscriptions(cb) {
         //console.time("fetchSubscriptionArray");
-        followModel.fetchSubscriptionArray(p.loggedUser.id, function (
-          subscriptions
-        ) {
-          testVars.uidList = subscriptions.concat([p.loggedUser.id]);
-          //console.timeEnd("fetchSubscriptionArray");
-          cb(true);
-        });
+        followModel.fetchSubscriptionArray(
+          p.loggedUser.id,
+          function (subscriptions) {
+            testVars.uidList = subscriptions.concat([p.loggedUser.id]);
+            //console.timeEnd("fetchSubscriptionArray");
+            cb(true);
+          }
+        );
       },
     ],
     [

diff --git a/app/controllers/admin/tests/user.js b/app/controllers/admin/tests/user.js
@@ -241,11 +241,13 @@ exports.makeTests = function (p) {
       'fetch user using API (logged as admin)',
       function (cb) {
         fetchTestUser(function (testUser) {
-          jsonGet('/api/user/' + testVars.registeredUid, {}, function (
-            apiUser
-          ) {
-            cb(testUser._id === apiUser._id);
-          });
+          jsonGet(
+            '/api/user/' + testVars.registeredUid,
+            {},
+            function (apiUser) {
+              cb(testUser._id === apiUser._id);
+            }
+          );
         });
       },
     ],

diff --git a/app/controllers/admin/users.js b/app/controllers/admin/users.js
@@ -126,11 +126,13 @@ exports.handleRequest = function (request, reqParams, response) {
   if (reqParams.action && handlers[reqParams.action])
     handlers[reqParams.action](reqParams, renderResult);
   else
-    userModel.fetchMulti({}, { sort: [['_id', 'desc']], limit: 600 }, function (
-      users
-    ) {
-      renderResult({ html: renderTemplate(/*mongodb.usernames*/ users) });
-    });
+    userModel.fetchMulti(
+      {},
+      { sort: [['_id', 'desc']], limit: 600 },
+      function (users) {
+        renderResult({ html: renderTemplate(/*mongodb.usernames*/ users) });
+      }
+    );
 };
 
 exports.controller = function (request, getParams, response) {

diff --git a/app/controllers/api/fbfriends.js b/app/controllers/api/fbfriends.js
@@ -21,12 +21,14 @@ exports.handleRequest = function (request, reqParams, response) {
     console.log('fbTok in db + param', fbTok, reqParams.fbAccessToken);
 
     if (reqParams.fetchUsersToInvite) {
-      facebookModel.fetchCachedFriends(loggedUser.id, fbTok, function (
-        fbfriends
-      ) {
-        var list = (fbfriends || {}).notOnWhyd || [];
-        response.legacyRender({ fbfriends: list });
-      });
+      facebookModel.fetchCachedFriends(
+        loggedUser.id,
+        fbTok,
+        function (fbfriends) {
+          var list = (fbfriends || {}).notOnWhyd || [];
+          response.legacyRender({ fbfriends: list });
+        }
+      );
     } else
       facebookModel.fetchFbFriendsWithSub(
         loggedUser,

diff --git a/app/controllers/api/follow.js b/app/controllers/api/follow.js
@@ -57,12 +57,12 @@ exports.isUserFollowing = function (
   followingMid,
   handler /*, fbAccessToken*/
 ) {
-  follow({ action: 'get', uId: uid, tId: followingMid }, function (
-    error,
-    result
-  ) {
-    handler(result);
-  });
+  follow(
+    { action: 'get', uId: uid, tId: followingMid },
+    function (error, result) {
+      handler(result);
+    }
+  );
 };
 
 var PUBLIC_ACTIONS = {

diff --git a/app/controllers/api/metadataExtractor.js b/app/controllers/api/metadataExtractor.js
@@ -30,14 +30,15 @@ function search(trackMetadata, cb) {
     if (!extractors.length) return cb(null, res);
     var extr = extractors.shift();
     console.log('searching', extr.name, '...');
-    metadataResolver.searchBestMatches(extr.api, trackMetadata, function (
-      err,
-      hits
-    ) {
-      console.log(extr.name, '=>', err || (hits || [])[0]);
-      res[extr.name] = err || (hits || [])[0];
-      next();
-    });
+    metadataResolver.searchBestMatches(
+      extr.api,
+      trackMetadata,
+      function (err, hits) {
+        console.log(extr.name, '=>', err || (hits || [])[0]);
+        res[extr.name] = err || (hits || [])[0];
+        next();
+      }
+    );
   })();
 }