riot-translatebot

commit e0e5a30156981581b4d7c115a8adad2d029396d2
parent 85bb3dfceecaaabb72f1cc886d9b3578194042ae
Author: MTRNord <mtrnord1@gmail.com>
Date:   Mon, 19 Jun 2017 21:02:54 +0200

Fix Login.

Signed-off-by: MTRNord <mtrnord1@gmail.com>

Diffstat:
M
src/index.js
 | 
13
+++----------
M
src/login.js
 | 
28
+++++++++++++++-------------

2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/index.js b/src/index.js
@@ -2,17 +2,10 @@ import login from './login';
 
 const mx = new login;
 mx.getClient().then(client => {
-    client.on("event", function(event) {
-        console.log(event.getType());
-    });
     client.on("Room.timeline", (event, room, toStartOfTimeline) => {
-        console.log(event.getType());
-        if (toStartOfTimeline) {
-            return; // don't print paginated results
-        }
-        if (event.getType() !== "m.room.message") {
-            return; // only print messages
-        }
+        if (toStartOfTimeline) return;
+        if (event.getType() !== "m.room.message") return;
+        if (event.getContent().msgtype !== "m.text") return;
         console.log(
             // the room name will update with m.room.name events automatically
             "(%s) %s :: %s", room.name, event.getSender(), event.getContent().body
diff --git a/src/login.js b/src/login.js
@@ -10,17 +10,17 @@ export default class Client {
         return this.login();
     };
 
-    login = async () => {
-        if (await fs.exists('user_data.json')){
+    login = () => {
+        if (node_fs.existsSync('user_data.json')){
             const json = node_fs.readFileSync('user_data.json');
             const valid_json = JSON.parse(json);
             if (valid_json.hasOwnProperty("access_token")){
                 return this.useToken(valid_json["access_token"], valid_json["user_id"], valid_json["home_server"]);
             } else {
-                this.useEnv();
+                return this.useEnv();
             }
         } else {
-            this.useEnv();
+            return this.useEnv();
         }
     };
 
@@ -30,17 +30,19 @@ export default class Client {
             userId: env_args[0]
         });
 
-        matrixClient.loginWithPassword(env_args[0], env_args[1]).done( data => {
+        matrixClient.loginWithPassword(env_args[0], env_args[1]).then( data => {
             console.log(data);
             fs.writeFile('user_data.json', JSON.stringify(data), 'utf8')
-                .then(() => {
-                    console.log("saved Access_token to file")
-                })
-                .catch(err => {
-                    console.error(err);
-                });
+            .then(() => {
+                console.log("saved Access_token to file");
+            })
+            .catch(err => {
+                console.error(err);
+            })
+        });
+        return new Promise(resolve => {
+            resolve(matrixClient);
         });
-        return this.login();
     };
 
     useToken = (token, userId, baseUrl) => {
@@ -51,6 +53,6 @@ export default class Client {
         });
         return new Promise(resolve => {
             resolve(matrixClient);
-        })
+        });
     };
 }
 \ No newline at end of file