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

Merge pull request #96 from Bankde/fix-fb-listening-encoding

Browse Source 
Fix fb listening encoding
This commit is contained in:
Taehoon Kim
2017-02-03 07:51:34 +09:00
committed by GitHub
parent dea64fb9b8 fc977c4fa0
commit 07b6c941b0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fbchat/client.py
View File

@@ -44,6 +44,7 @@ UserInfoURL ="https://www.facebook.com/chat/user_info/"
ConnectURL ="https://www.facebook.com/ajax/add_friend/action.php?dpr=1" ConnectURL ="https://www.facebook.com/ajax/add_friend/action.php?dpr=1"
RemoveUserURL="https://www.facebook.com/chat/remove_participants/" RemoveUserURL="https://www.facebook.com/chat/remove_participants/"
LogoutURL ="https://www.facebook.com/logout.php" LogoutURL ="https://www.facebook.com/logout.php"
facebookEncoding = 'UTF-8'
# Log settings # Log settings
log = logging.getLogger("client") log = logging.getLogger("client")
@@ -375,7 +376,7 @@ class Client(object):
""" """
r = self._postFile(UploadURL, image) r = self._postFile(UploadURL, image)
if isinstance(r._content, str) is False: if isinstance(r._content, str) is False:
r._content = r._content.decode("utf-8") r._content = r._content.decode(facebookEncoding)
# Strip the start and parse out the returned image_id # Strip the start and parse out the returned image_id
return json.loads(r._content[9:])['payload']['metadata'][0]['image_id'] return json.loads(r._content[9:])['payload']['metadata'][0]['image_id']
@@ -564,6 +565,7 @@ class Client(object):
} }
r = self._get(StickyURL, data) r = self._get(StickyURL, data)
r.encoding = facebookEncoding
j = get_json(r.text) j = get_json(r.text)
self.seq = j.get('seq', '0') self.seq = j.get('seq', '0')