Merge pull request #25 from shyim/master

Fixed MySQL User loading

.gitignore

@@ -1 +1,2 @@
+.idea
 node_modules/

src/db/mysql.js

@@ -101,8 +101,11 @@ export function createTable(name) {
 export function getUserByEmail(email) {
   return new Promise((resolve) => {
     this.db.instance.query(`SELECT * FROM ${CFG.SERVER_MYSQL_TABLE} WHERE email=? LIMIT 1`, [email], (e, rows, fields) => {
-      if (e) console.log(e);
-      else resolve(rows);
+      if (e) {
+        console.log(e);
+      } else {
+        resolve(rows[0]);
+      }
     });
   });
 }

src/player.js

@@ -77,7 +77,11 @@ class Player {
   updateByObject(obj) {
     for (let key in obj) {
       if (this.hasOwnProperty(key)) {
-        this[key] = obj[key];
+        if (key === "send_marketing_emails" || key === "send_push_notifications") {
+          this[key] = !!obj[key];
+        } else {
+          this[key] = obj[key];
+        }
       }
     };
   }