Move most of Client._getSendData to State._do_send_request

fbchat/_client.py

@@ -1032,19 +1032,7 @@ class Client(object):
         return message if isinstance(message, Message) else Message(text=message)
 
     def _getSendData(self, thread_id=None, thread_type=ThreadType.USER):
-        """Return the data needed to send a request to `SendURL`."""
+        data = {}
-        messageAndOTID = generateOfflineThreadingID()
-        timestamp = now()
-        data = {
-            "client": "mercury",
-            "author": "fbid:{}".format(self._uid),
-            "timestamp": timestamp,
-            "source": "source:chat:web",
-            "offline_threading_id": messageAndOTID,
-            "message_id": messageAndOTID,
-            "threading_id": generateMessageID(self._state._client_id),
-            "ephemeral_ttl_mode:": "0",
-        }
 
         # Set recipient
         if thread_type in [ThreadType.USER, ThreadType.PAGE]:

fbchat/_state.py

@@ -299,6 +299,15 @@ class State(object):
         ]
 
     def _do_send_request(self, data):
+        offline_threading_id = _util.generateOfflineThreadingID()
+        data["client"] = "mercury"
+        data["author"] = "fbid:{}".format(self.user_id)
+        data["timestamp"] = _util.now()
+        data["source"] = "source:chat:web"
+        data["offline_threading_id"] = offline_threading_id
+        data["message_id"] = offline_threading_id
+        data["threading_id"] = _util.generateMessageID(self._client_id)
+        data["ephemeral_ttl_mode:"] = "0"
         j = self._post("/messaging/send/", data)
 
         # update JS token if received in response