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

Add message parameter to sending location (#416)

Browse Source
This commit is contained in:
Kacper Ziubryniewicz
2019-04-17 22:35:04 +02:00
committed by Mads Marquart
parent 7db7868d2b
commit 73c6be1969
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fbchat/_client.py
View File

@@ -1472,23 +1472,29 @@ class Client(object):
r = self._post(self.req_url.UNSEND, data) r = self._post(self.req_url.UNSEND, data)
r.raise_for_status() r.raise_for_status()
def _sendLocation(self, location, current=True, thread_id=None, thread_type=None): def _sendLocation(
self, location, current=True, message=None, thread_id=None, thread_type=None
):
thread_id, thread_type = self._getThread(thread_id, thread_type) thread_id, thread_type = self._getThread(thread_id, thread_type)
data = self._getSendData(thread_id=thread_id, thread_type=thread_type) data = self._getSendData(
message=message, thread_id=thread_id, thread_type=thread_type
)
data["action_type"] = "ma-type:user-generated-message" data["action_type"] = "ma-type:user-generated-message"
data["location_attachment[coordinates][latitude]"] = location.latitude data["location_attachment[coordinates][latitude]"] = location.latitude
data["location_attachment[coordinates][longitude]"] = location.longitude data["location_attachment[coordinates][longitude]"] = location.longitude
data["location_attachment[is_current_location]"] = current data["location_attachment[is_current_location]"] = current
return self._doSendRequest(data) return self._doSendRequest(data)
def sendLocation(self, location, thread_id=None, thread_type=None): def sendLocation(self, location, message=None, thread_id=None, thread_type=None):
""" """
Sends a given location to a thread as the user's current location Sends a given location to a thread as the user's current location
:param location: Location to send :param location: Location to send
:param message: Additional message
:param thread_id: User/Group ID to send to. See :ref:`intro_threads` :param thread_id: User/Group ID to send to. See :ref:`intro_threads`
:param thread_type: See :ref:`intro_threads` :param thread_type: See :ref:`intro_threads`
:type location: models.LocationAttachment :type location: models.LocationAttachment
:type message: models.Message
:type thread_type: models.ThreadType :type thread_type: models.ThreadType
:return: :ref:`Message ID <intro_message_ids>` of the sent message :return: :ref:`Message ID <intro_message_ids>` of the sent message
:raises: FBchatException if request failed :raises: FBchatException if request failed
@@ -1496,18 +1502,23 @@ class Client(object):
self._sendLocation( self._sendLocation(
location=location, location=location,
current=True, current=True,
message=message,
thread_id=thread_id, thread_id=thread_id,
thread_type=thread_type, thread_type=thread_type,
) )
def sendPinnedLocation(self, location, thread_id=None, thread_type=None): def sendPinnedLocation(
self, location, message=None, thread_id=None, thread_type=None
):
""" """
Sends a given location to a thread as a pinned location Sends a given location to a thread as a pinned location
:param location: Location to send :param location: Location to send
:param message: Additional message
:param thread_id: User/Group ID to send to. See :ref:`intro_threads` :param thread_id: User/Group ID to send to. See :ref:`intro_threads`
:param thread_type: See :ref:`intro_threads` :param thread_type: See :ref:`intro_threads`
:type location: models.LocationAttachment :type location: models.LocationAttachment
:type message: models.Message
:type thread_type: models.ThreadType :type thread_type: models.ThreadType
:return: :ref:`Message ID <intro_message_ids>` of the sent message :return: :ref:`Message ID <intro_message_ids>` of the sent message
:raises: FBchatException if request failed :raises: FBchatException if request failed
@@ -1515,6 +1526,7 @@ class Client(object):
self._sendLocation( self._sendLocation(
location=location, location=location,
current=False, current=False,
message=message,
thread_id=thread_id, thread_id=thread_id,
thread_type=thread_type, thread_type=thread_type,
) )