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

Backport e348425

Browse Source
This commit is contained in:
Mads Marquart
2019-12-15 15:26:53 +01:00
parent 813219cd9c
commit a97ef67411
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fbchat/_client.py
View File

@@ -280,7 +280,7 @@ class Client(object):
def _forcedFetch(self, thread_id, mid):
params = {"thread_and_message_id": {"thread_id": thread_id, "message_id": mid}}
j, = self.graphql_requests(_graphql.from_doc_id("1768656253222505", params))
(j,) = self.graphql_requests(_graphql.from_doc_id("1768656253222505", params))
return j
def fetchThreads(self, thread_location, before=None, after=None, limit=None):
@@ -404,7 +404,7 @@ class Client(object):
FBchatException: If request failed
"""
params = {"search": name, "limit": limit}
j, = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_USER, params))
(j,) = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_USER, params))
return [User._from_graphql(node) for node in j[name]["users"]["nodes"]]
@@ -421,7 +421,7 @@ class Client(object):
FBchatException: If request failed
"""
params = {"search": name, "limit": limit}
j, = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_PAGE, params))
(j,) = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_PAGE, params))
return [Page._from_graphql(node) for node in j[name]["pages"]["nodes"]]
@@ -439,7 +439,7 @@ class Client(object):
FBchatException: If request failed
"""
params = {"search": name, "limit": limit}
j, = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_GROUP, params))
(j,) = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_GROUP, params))
return [Group._from_graphql(node) for node in j["viewer"]["groups"]["nodes"]]
@@ -457,7 +457,9 @@ class Client(object):
FBchatException: If request failed
"""
params = {"search": name, "limit": limit}
j, = self.graphql_requests(_graphql.from_query(_graphql.SEARCH_THREAD, params))
(j,) = self.graphql_requests(
_graphql.from_query(_graphql.SEARCH_THREAD, params)
)
rtn = []
for node in j[name]["threads"]["nodes"]:
@@ -764,7 +766,7 @@ class Client(object):
"load_read_receipts": True,
"before": before,
}
j, = self.graphql_requests(_graphql.from_doc_id("1860982147341344", params))
(j,) = self.graphql_requests(_graphql.from_doc_id("1860982147341344", params))
if j.get("message_thread") is None:
raise FBchatException("Could not fetch thread {}: {}".format(thread_id, j))
@@ -823,7 +825,7 @@ class Client(object):
"includeDeliveryReceipts": True,
"includeSeqID": False,
}
j, = self.graphql_requests(_graphql.from_doc_id("1349387578499440", params))
(j,) = self.graphql_requests(_graphql.from_doc_id("1349387578499440", params))
rtn = []
for node in j["viewer"]["message_threads"]["nodes"]:
@@ -943,7 +945,7 @@ class Client(object):
return Plan._from_fetch(j)
def _getPrivateData(self):
j, = self.graphql_requests(_graphql.from_doc_id("1868889766468115", {}))
(j,) = self.graphql_requests(_graphql.from_doc_id("1868889766468115", {}))
return j["viewer"]
def getPhoneNumbers(self):
@@ -994,7 +996,7 @@ class Client(object):
thread_id, thread_type = self._getThread(thread_id, None)
data = {"id": thread_id, "first": 48}
thread_id = str(thread_id)
j, = self.graphql_requests(_graphql.from_query_id("515216185516880", data))
(j,) = self.graphql_requests(_graphql.from_query_id("515216185516880", data))
while True:
try:
i = j[thread_id]["message_shared_media"]["edges"][0]
@@ -1005,7 +1007,7 @@ class Client(object):
data["after"] = j[thread_id]["message_shared_media"][
"page_info"
].get("end_cursor")
j, = self.graphql_requests(
(j,) = self.graphql_requests(
_graphql.from_query_id("515216185516880", data)
)
continue
@@ -1534,7 +1536,7 @@ class Client(object):
"response": "ACCEPT" if approve else "DENY",
"surface": "ADMIN_MODEL_APPROVAL_CENTER",
}
j, = self.graphql_requests(
(j,) = self.graphql_requests(
_graphql.from_doc_id("1574519202665847", {"data": data})
)
@@ -1589,7 +1591,7 @@ class Client(object):
Raises:
FBchatException: If request failed
"""
(image_id, mimetype), = self._upload(get_files_from_urls([image_url]))
((image_id, mimetype),) = self._upload(get_files_from_urls([image_url]))
return self._changeGroupImage(image_id, thread_id)
def changeGroupImageLocal(self, image_path, thread_id=None):
@@ -1603,7 +1605,7 @@ class Client(object):
FBchatException: If request failed
"""
with get_files_from_paths([image_path]) as files:
(image_id, mimetype), = self._upload(files)
((image_id, mimetype),) = self._upload(files)
return self._changeGroupImage(image_id, thread_id)