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

Merge branch 'master' into cleanup

Browse Source
This commit is contained in:
Mads Marquart
2019-04-17 20:50:08 +02:00
parent 48e7203ca6 4f76b79629
commit ec0e3a91d1
4 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fbchat/_client.py
View File

@@ -387,9 +387,9 @@ class Client(object):
if "home" in r.url:
return r
del (data["approvals_code"])
del (data["submit[Submit Code]"])
del (data["codes_submitted"])
del data["approvals_code"]
del data["submit[Submit Code]"]
del data["codes_submitted"]
data["name_action_selected"] = "save_device"
data["submit[Continue]"] = "Continue"
@@ -401,7 +401,7 @@ class Client(object):
if "home" in r.url:
return r
del (data["name_action_selected"])
del data["name_action_selected"]
log.info(
"Starting Facebook checkup flow."
) # At this stage, we have dtsg, nh, submit[Continue]
@@ -410,7 +410,7 @@ class Client(object):
if "home" in r.url:
return r
del (data["submit[Continue]"])
del data["submit[Continue]"]
data["submit[This was me]"] = "This Was Me"
log.info(
"Verifying login attempt."
@@ -420,7 +420,7 @@ class Client(object):
if "home" in r.url:
return r
del (data["submit[This was me]"])
del data["submit[This was me]"]
data["submit[Continue]"] = "Continue"
data["name_action_selected"] = "save_device"
log.info(
@@ -1045,7 +1045,7 @@ class Client(object):
"load_read_receipts": True,
"before": before,
}
j = self.graphql_request(GraphQL(doc_id="1386147188135407", params=params))
j = self.graphql_request(GraphQL(doc_id="1860982147341344", params=params))
if j.get("message_thread") is None:
raise FBchatException("Could not fetch thread {}: {}".format(thread_id, j))
@@ -1320,6 +1320,9 @@ class Client(object):
xmd["quick_replies"] = xmd["quick_replies"][0]
data["platform_xmd"] = json.dumps(xmd)
if message.reply_to_id:
data["replied_to_message_id"] = message.reply_to_id
return data
def _doSendRequest(self, data, get_thread_id=False):
@@ -2908,6 +2911,24 @@ class Client(object):
msg=m,
)
elif d.get("deltaMessageReply"):
i = d["deltaMessageReply"]
metadata = i["message"]["messageMetadata"]
thread_id, thread_type = getThreadIdAndThreadType(metadata)
message = graphql_to_message_reply(i["message"])
message.replied_to = graphql_to_message_reply(i["repliedToMessage"])
self.onMessage(
mid=message.uid,
author_id=message.author,
message=message.text,
message_object=message,
thread_id=thread_id,
thread_type=thread_type,
ts=message.timestamp,
metadata=metadata,
msg=m,
)
# New message
elif delta.get("class") == "NewMessage":
mentions = []