Merge pull request #61 from thekindlyone/iss60

Iss60
This commit is contained in:
Taehoon Kim
2016-09-22 22:33:07 +09:00
committed by GitHub

View File

@@ -22,6 +22,7 @@ from .utils import *
from .models import * from .models import *
from .stickers import * from .stickers import *
import time import time
import sys
# URLs # URLs
LoginURL ="https://m.facebook.com/login.php?login_attempt=1" LoginURL ="https://m.facebook.com/login.php?login_attempt=1"
SearchURL ="https://www.facebook.com/ajax/typeahead/search.php" SearchURL ="https://www.facebook.com/ajax/typeahead/search.php"
@@ -526,7 +527,7 @@ class Client(object):
elif m['type'] in ['delta']: elif m['type'] in ['delta']:
if 'messageMetadata' in m['delta']: if 'messageMetadata' in m['delta']:
mid = m['delta']['messageMetadata']['messageId'] mid = m['delta']['messageMetadata']['messageId']
message = m['delta']['body'] message = m['delta'].get('body','')
fbid = m['delta']['messageMetadata']['actorFbId'] fbid = m['delta']['messageMetadata']['actorFbId']
name = None name = None
self.on_message(mid, fbid, name, message, m) self.on_message(mid, fbid, name, message, m)
@@ -534,7 +535,8 @@ class Client(object):
if self.debug: if self.debug:
print(m) print(m)
except Exception as e: except Exception as e:
self.on_message_error(e, m) # ex_type, ex, tb = sys.exc_info()
self.on_message_error(sys.exc_info(), m)
def listen(self, markAlive=True): def listen(self, markAlive=True):