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

Fixes #149, the issue was that Facebook changed their code

Browse Source
This commit is contained in:
Mads Marquart
2017-06-02 16:02:27 +02:00
parent d381d8c940
commit c8d9d05ed3
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fbchat/client.py
View File

@@ -187,7 +187,7 @@ class Client(object):
self.fb_h = soup.find("input", {'name':'h'})['value'] self.fb_h = soup.find("input", {'name':'h'})['value']
self._setttstamp() self._setttstamp()
# Set default payload # Set default payload
self.payloadDefault['__rev'] = int(r.text.split('"revision":',1)[1].split(",",1)[0]) self.payloadDefault['__rev'] = int(r.text.split('"client_revision":',1)[1].split(",",1)[0])
self.payloadDefault['__user'] = self.uid self.payloadDefault['__user'] = self.uid
self.payloadDefault['__a'] = '1' self.payloadDefault['__a'] = '1'
self.payloadDefault['ttstamp'] = self.ttstamp self.payloadDefault['ttstamp'] = self.ttstamp
@@ -308,7 +308,7 @@ class Client(object):
# Quick check to see if session_cookies is formatted properly # Quick check to see if session_cookies is formatted properly
if not session_cookies or 'c_user' not in session_cookies: if not session_cookies or 'c_user' not in session_cookies:
return False return False
# Load cookies into current session # Load cookies into current session
self._session.cookies = requests.cookies.merge_cookies(self._session.cookies, session_cookies) self._session.cookies = requests.cookies.merge_cookies(self._session.cookies, session_cookies)
self._post_login() self._post_login()
@@ -317,7 +317,7 @@ class Client(object):
def login(self, email, password, max_retries=5): def login(self, email, password, max_retries=5):
# Logging in # Logging in
log.info("Logging in {}...".format(email)) log.info("Logging in {}...".format(email))
if not (email and password): if not (email and password):
raise Exception("Email and password not set.") raise Exception("Email and password not set.")
@@ -352,7 +352,7 @@ class Client(object):
def setDefaultRecipient(self, recipient_id, is_user=True): def setDefaultRecipient(self, recipient_id, is_user=True):
"""Sets default recipient to send messages and images to. """Sets default recipient to send messages and images to.
:param recipient_id: the user id or thread id that you want to send a message to :param recipient_id: the user id or thread id that you want to send a message to
:param is_user: determines if the recipient_id is for user or thread :param is_user: determines if the recipient_id is for user or thread
""" """
@@ -451,7 +451,7 @@ class Client(object):
:param like: size of the like sticker you want to send :param like: size of the like sticker you want to send
:param image_id: id for the image to send, gotten from the UploadURL :param image_id: id for the image to send, gotten from the UploadURL
:param add_user_ids: a list of user ids to add to a chat :param add_user_ids: a list of user ids to add to a chat
returns a list of message ids of the sent message(s) returns a list of message ids of the sent message(s)
""" """
@@ -523,7 +523,7 @@ class Client(object):
data["sticker_id"] = sticker data["sticker_id"] = sticker
r = self._post(SendURL, data) r = self._post(SendURL, data)
if not r.ok: if not r.ok:
log.warning('Error when sending message: Got {} response'.format(r.status_code)) log.warning('Error when sending message: Got {} response'.format(r.status_code))
return False return False
@@ -535,7 +535,7 @@ class Client(object):
# 'errorDescription' is in the users own language! # 'errorDescription' is in the users own language!
log.warning('Error #{} when sending message: {}'.format(j['error'], j['errorDescription'])) log.warning('Error #{} when sending message: {}'.format(j['error'], j['errorDescription']))
return False return False
message_ids = [] message_ids = []
try: try:
message_ids += [action['message_id'] for action in j['payload']['actions'] if 'message_id' in action] message_ids += [action['message_id'] for action in j['payload']['actions'] if 'message_id' in action]
@@ -1036,4 +1036,3 @@ class Client(object):
def on_unknown_type(self, m): def on_unknown_type(self, m):
"""subclass Client and override this method to add custom behavior on event""" """subclass Client and override this method to add custom behavior on event"""
log.debug("Unknown type {}".format(m)) log.debug("Unknown type {}".format(m))