Warning if favorite not found.

refs #92

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

lib/commands/user.js

@@ -2,6 +2,7 @@
 var prompt = require('prompt');
 var sprintf = require('sprintf-js').sprintf;
 
+var h = require('../helper');
 var config = require('../config');
 var chalk = require('../chalk');
 var log = require('../log');
@@ -62,9 +63,10 @@ cmd.handler = function(argv) {
     // show current user
     user = session.getUser();
     if (user) {
-      log.info(chalk.gray(sprintf(' %-20s %s', 'User', 'Host')));
+      log.info(chalk.gray(sprintf(' %-9s %-20s %s', 'Premium', 'User', 'Host')));
       log.info(chalk.gray('-'.repeat(60)));
-      log.printf(' %s %s',
+      log.printf('    %s      %s %s',
+        h.prettyText('', user.paid || false),
         chalk.yellow(sprintf('%-20s', user.name)),
         config.sys.urls.base);
     } else

lib/plugins/leetcode.js

@@ -380,8 +380,8 @@ plugin.getFavorites = function(cb) {
   });
 };
 
-plugin.getUser = function(cb) {
-  log.debug('running leetcode.getUser');
+plugin.getUserInfo = function(cb) {
+  log.debug('running leetcode.getUserInfo');
   const opts = makeOpts(config.sys.urls.graphql);
   opts.headers.Origin = config.sys.urls.base;
   opts.headers.Referer = config.sys.urls.base;
@@ -390,6 +390,7 @@ plugin.getUser = function(cb) {
     query: [
       '{',
       '  user {',
+      '    username',
       '    isCurrentUserPremium',
       '  }',
       '}'
@@ -482,18 +483,24 @@ plugin.signin = function(user, cb) {
   });
 };
 
-plugin.initUser = function(user, cb) {
+plugin.getUser = function(user, cb) {
   plugin.getFavorites(function(e, favorites) {
     if (!e) {
-      const favorite = favorites.favorites.private_favorites.find(function(f) {
-        return f.name === 'Favorite';
-      });
-      user.hash = favorite.id_hash;
-      user.name = favorites.user_name;
+      const f = favorites.favorites.private_favorites.find(f => f.name === 'Favorite');
+      if (f) {
+        user.hash = f.id_hash;
+        user.name = favorites.user_name;
+      } else {
+        log.warn('Favorite not found?');
+      }
+    } else {
+      log.warn('Failed to retrieve user favorites: ' + e);
     }
-    plugin.getUser(function(e, _user) {
+
+    plugin.getUserInfo(function(e, _user) {
       if (!e) {
         user.paid = _user.isCurrentUserPremium;
+        user.name = _user.username;
       }
       session.saveUser(user);
       return cb(null, user);
@@ -505,7 +512,7 @@ plugin.login = function(user, cb) {
   log.debug('running leetcode.login');
   plugin.signin(user, function(e, user) {
     if (e) return cb(e);
-    plugin.initUser(user, cb);
+    plugin.getUser(user, cb);
   });
 };