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

Merge pull request #108 from madsmtm/master

Browse Source 
Fixed some bugs
This commit is contained in:
Taehoon Kim
2017-02-08 12:06:57 +09:00
committed by GitHub
parent 58c40ff286 fdb72e1f66
commit 09dd783a1f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fbchat/client.py
View File

@@ -498,7 +498,7 @@ class Client(object):
:param image: path to a local image to send :param image: path to a local image to send
""" """
mimetype = guess_type(image)[0] mimetype = guess_type(image)[0]
image_id = self.uploadImage({'file': (image, open(image), mimetype)}) image_id = self.uploadImage({'file': (image, open(image, 'rb'), mimetype)})
return self.send(recipient_id, message, message_type, None, image_id) return self.send(recipient_id, message, message_type, None, image_id)
def uploadImage(self, image): def uploadImage(self, image):
@@ -760,7 +760,7 @@ class Client(object):
mid = m['delta']['messageMetadata']['messageId'] mid = m['delta']['messageMetadata']['messageId']
message = m['delta'].get('body','') message = m['delta'].get('body','')
fbid = m['delta']['messageMetadata']['actorFbId'] fbid = m['delta']['messageMetadata']['actorFbId']
self.on_message(mid, fbid, message, m, recipient_id, thread_type) self.on_message_new(mid, fbid, message, m, recipient_id, thread_type)
elif m['type'] in ['jewel_requests_add']: elif m['type'] in ['jewel_requests_add']:
from_id = m['from'] from_id = m['from']
self.on_friend_request(from_id) self.on_friend_request(from_id)
@@ -878,7 +878,7 @@ class Client(object):
return r.ok return r.ok
def on_message(self, mid, author_id, message, metadata, recipient_id, thread_type): def on_message_new(self, mid, author_id, message, metadata, recipient_id, thread_type):
''' '''
subclass Client and override this method to add custom behavior on event subclass Client and override this method to add custom behavior on event