From 329f8e5ae861bc7668d6ed70bfafb5d7e6eb54f8 Mon Sep 17 00:00:00 2001 From: Dainius Date: Mon, 8 May 2017 17:02:28 +0300 Subject: [PATCH] fix of conflict resolution --- fbchat/client.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index f8e0422..d16c136 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -90,8 +90,8 @@ class Client(object): self.threads = [] # Setup event hooks - self.onLoggingIn = EventHook() - self.onLoggedIn = EventHook() + self.onLoggingIn = EventHook(email=str) + self.onLoggedIn = EventHook(email=str) self.onListening = EventHook() self.onMessage = EventHook(mid=str, author_id=str, message=str, thread_id=int, thread_type=ThreadType, ts=str, metadata=dict) @@ -110,8 +110,8 @@ class Client(object): self.onUnknownMesssageType = EventHook(msg=dict) # Setup event handlers - self.onLoggingIn += lambda: log.info("Logging in...") - self.onLoggedIn += lambda: log.info("Login successful.") + self.onLoggingIn += lambda email: log.info("Logging in %s..." % email) + self.onLoggedIn += lambda email: log.info("Login of %s successful." % email) self.onListening += lambda: log.info("Listening...") self.onMessage += lambda mid, author_id, message, thread_id, thread_type, ts, metadata:\ @@ -333,7 +333,7 @@ class Client(object): def isLoggedIn(self): # Send a request to the login url, to see if we're directed to the home page. r = self._cleanGet(LoginURL) - return 'home' in r.url: + return 'home' in r.url def getSession(self): """Returns the session cookies"""