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

Move request counter into State model

Browse Source
This commit is contained in:
Mads Marquart
2019-07-01 13:31:30 +02:00
parent f07122d446
commit 8e7afa2edf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fbchat/_client.py
View File

@@ -105,8 +105,6 @@ class Client(object):
def _generatePayload(self, query): def _generatePayload(self, query):
if not query: if not query:
query = {} query = {}
query["__req"] = str_base(self._req_counter, 36)
self._req_counter += 1
query.update(self._state.get_params()) query.update(self._state.get_params())
return query return query
@@ -188,7 +186,6 @@ class Client(object):
) )
def _cleanPost(self, url, query=None): def _cleanPost(self, url, query=None):
self._req_counter += 1
return self._session.post( return self._session.post(
prefix_url(url), headers=self._header, data=query, verify=self.ssl_verify prefix_url(url), headers=self._header, data=query, verify=self.ssl_verify
) )
@@ -267,7 +264,6 @@ class Client(object):
def _resetValues(self): def _resetValues(self):
self._state = State() self._state = State()
self._session = requests.session() self._session = requests.session()
self._req_counter = 1
self._seq = "0" self._seq = "0"
self._uid = None self._uid = None

3
fbchat/_state.py
View File

@@ -12,12 +12,15 @@ class State(object):
fb_dtsg = attr.ib(None) fb_dtsg = attr.ib(None)
_revision = attr.ib(None) _revision = attr.ib(None)
_counter = attr.ib(0)
def get_params(self): def get_params(self):
if self.fb_dtsg is None: if self.fb_dtsg is None:
return {} return {}
self._counter += 1 # TODO: Make this operation atomic / thread-safe
return { return {
"__a": 1, "__a": 1,
"__req": _util.str_base(self._counter, 36),
"__rev": self._revision, "__rev": self._revision,
"fb_dtsg": self.fb_dtsg, "fb_dtsg": self.fb_dtsg,
} }