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

Remove GraphQL object in favor of helper functions

Browse Source
This commit is contained in:
Mads Marquart
2019-07-02 18:26:35 +02:00
parent 1b2aeb01ce
commit 1293814c3a
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fbchat/_client.py
View File

@@ -11,7 +11,6 @@ from collections import OrderedDict
from ._util import *
from .models import *
from . import _graphql
from ._graphql import GraphQL
from ._state import State
import time
import json
@@ -158,8 +157,8 @@ class Client(object):
def graphql_requests(self, *queries):
"""
:param queries: Zero or more GraphQL objects
:type queries: GraphQL
:param queries: Zero or more dictionaries
:type queries: dict
:raises: FBchatException if request failed
:return: A tuple containing json graphql queries
@@ -324,7 +323,7 @@ class Client(object):
def _forcedFetch(self, thread_id, mid):
params = {"thread_and_message_id": {"thread_id": thread_id, "message_id": mid}}
return self.graphql_request(GraphQL(doc_id="1768656253222505", params=params))
return self.graphql_request(_graphql.from_doc_id("1768656253222505", params))
def fetchThreads(self, thread_location, before=None, after=None, limit=None):
"""
@@ -436,7 +435,7 @@ class Client(object):
:raises: FBchatException if request failed
"""
params = {"search": name, "limit": limit}
j = self.graphql_request(GraphQL(query=_graphql.SEARCH_USER, params=params))
j = self.graphql_request(_graphql.from_query(_graphql.SEARCH_USER, params))
return [User._from_graphql(node) for node in j[name]["users"]["nodes"]]
@@ -450,7 +449,7 @@ class Client(object):
:raises: FBchatException if request failed
"""
params = {"search": name, "limit": limit}
j = self.graphql_request(GraphQL(query=_graphql.SEARCH_PAGE, params=params))
j = self.graphql_request(_graphql.from_query(_graphql.SEARCH_PAGE, params))
return [Page._from_graphql(node) for node in j[name]["pages"]["nodes"]]
@@ -465,7 +464,7 @@ class Client(object):
:raises: FBchatException if request failed
"""
params = {"search": name, "limit": limit}
j = self.graphql_request(GraphQL(query=_graphql.SEARCH_GROUP, params=params))
j = self.graphql_request(_graphql.from_query(_graphql.SEARCH_GROUP, params))
return [Group._from_graphql(node) for node in j["viewer"]["groups"]["nodes"]]
@@ -480,7 +479,7 @@ class Client(object):
:raises: FBchatException if request failed
"""
params = {"search": name, "limit": limit}
j = self.graphql_request(GraphQL(query=_graphql.SEARCH_THREAD, params=params))
j = self.graphql_request(_graphql.from_query(_graphql.SEARCH_THREAD, params))
rtn = []
for node in j[name]["threads"]["nodes"]:
@@ -706,7 +705,7 @@ class Client(object):
"load_read_receipts": False,
"before": None,
}
queries.append(GraphQL(doc_id="2147762685294928", params=params))
queries.append(_graphql.from_doc_id("2147762685294928", params))
j = self.graphql_requests(*queries)
@@ -771,7 +770,7 @@ class Client(object):
"load_read_receipts": True,
"before": before,
}
j = self.graphql_request(GraphQL(doc_id="1860982147341344", params=params))
j = self.graphql_request(_graphql.from_doc_id("1860982147341344", params))
if j.get("message_thread") is None:
raise FBchatException("Could not fetch thread {}: {}".format(thread_id, j))
@@ -828,7 +827,7 @@ class Client(object):
"includeDeliveryReceipts": True,
"includeSeqID": False,
}
j = self.graphql_request(GraphQL(doc_id="1349387578499440", params=params))
j = self.graphql_request(_graphql.from_doc_id("1349387578499440", params))
rtn = []
for node in j["viewer"]["message_threads"]["nodes"]:
@@ -933,7 +932,7 @@ class Client(object):
return Plan._from_fetch(j)
def _getPrivateData(self):
j = self.graphql_request(GraphQL(doc_id="1868889766468115"))
j = self.graphql_request(_graphql.from_doc_id("1868889766468115", {}))
return j["viewer"]
def getPhoneNumbers(self):
@@ -1570,7 +1569,7 @@ class Client(object):
"surface": "ADMIN_MODEL_APPROVAL_CENTER",
}
j = self.graphql_request(
GraphQL(doc_id="1574519202665847", params={"data": data})
_graphql.from_doc_id("1574519202665847", {"data": data})
)
def acceptUsersToGroup(self, user_ids, thread_id=None):