karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix of conflict resolution

Browse Source
This commit is contained in:
Dainius
2017-05-08 17:02:28 +03:00
parent 22688fe847
commit 329f8e5ae8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fbchat/client.py
View File

@@ -90,8 +90,8 @@ class Client(object):
self.threads = [] self.threads = []
# Setup event hooks # Setup event hooks
self.onLoggingIn = EventHook() self.onLoggingIn = EventHook(email=str)
self.onLoggedIn = EventHook() self.onLoggedIn = EventHook(email=str)
self.onListening = EventHook() self.onListening = EventHook()
self.onMessage = EventHook(mid=str, author_id=str, message=str, thread_id=int, thread_type=ThreadType, ts=str, metadata=dict) 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) self.onUnknownMesssageType = EventHook(msg=dict)
# Setup event handlers # Setup event handlers
self.onLoggingIn += lambda: log.info("Logging in...") self.onLoggingIn += lambda email: log.info("Logging in %s..." % email)
self.onLoggedIn += lambda: log.info("Login successful.") self.onLoggedIn += lambda email: log.info("Login of %s successful." % email)
self.onListening += lambda: log.info("Listening...") self.onListening += lambda: log.info("Listening...")
self.onMessage += lambda mid, author_id, message, thread_id, thread_type, ts, metadata:\ self.onMessage += lambda mid, author_id, message, thread_id, thread_type, ts, metadata:\
@@ -333,7 +333,7 @@ class Client(object):
def isLoggedIn(self): def isLoggedIn(self):
# Send a request to the login url, to see if we're directed to the home page. # Send a request to the login url, to see if we're directed to the home page.
r = self._cleanGet(LoginURL) r = self._cleanGet(LoginURL)
return 'home' in r.url: return 'home' in r.url
def getSession(self): def getSession(self):
"""Returns the session cookies""" """Returns the session cookies"""