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

Privatize fb_h and client_id variables

Browse Source 
These are sparsely used and badly named, so probably not externally depended on externally
This commit is contained in:
Mads Marquart
2019-03-30 18:50:11 +01:00
parent a079797fca
commit 9b81365b0a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fbchat/_client.py
View File

@@ -303,7 +303,7 @@ class Client(object):
def _postLogin(self): def _postLogin(self):
self.payloadDefault = OrderedDict() self.payloadDefault = OrderedDict()
self.client_id = hex(int(random() * 2147483648))[2:] self._client_id = hex(int(random() * 2147483648))[2:]
self.uid = self._session.cookies.get_dict().get("c_user") self.uid = self._session.cookies.get_dict().get("c_user")
if self.uid is None: if self.uid is None:
raise FBchatException("Could not find c_user cookie") raise FBchatException("Could not find c_user cookie")
@@ -320,7 +320,7 @@ class Client(object):
fb_h_element = soup.find("input", {"name": "h"}) fb_h_element = soup.find("input", {"name": "h"})
if fb_h_element: if fb_h_element:
self.fb_h = fb_h_element["value"] self._fb_h = fb_h_element["value"]
ttstamp = "" ttstamp = ""
for i in fb_dtsg: for i in fb_dtsg:
@@ -510,11 +510,11 @@ class Client(object):
:return: True if the action was successful :return: True if the action was successful
:rtype: bool :rtype: bool
""" """
if not hasattr(self, "fb_h"): if not hasattr(self, "_fb_h"):
h_r = self._post(self.req_url.MODERN_SETTINGS_MENU, {"pmid": "4"}) h_r = self._post(self.req_url.MODERN_SETTINGS_MENU, {"pmid": "4"})
self.fb_h = re.search(r'name=\\"h\\" value=\\"(.*?)\\"', h_r.text).group(1) self._fb_h = re.search(r'name=\\"h\\" value=\\"(.*?)\\"', h_r.text).group(1)
data = {"ref": "mb", "h": self.fb_h} data = {"ref": "mb", "h": self._fb_h}
r = self._get(self.req_url.LOGOUT, data) r = self._get(self.req_url.LOGOUT, data)
@@ -1254,7 +1254,7 @@ class Client(object):
"source": "source:chat:web", "source": "source:chat:web",
"offline_threading_id": messageAndOTID, "offline_threading_id": messageAndOTID,
"message_id": messageAndOTID, "message_id": messageAndOTID,
"threading_id": generateMessageID(self.client_id), "threading_id": generateMessageID(self._client_id),
"ephemeral_ttl_mode:": "0", "ephemeral_ttl_mode:": "0",
} }
@@ -2377,7 +2377,7 @@ class Client(object):
def _ping(self): def _ping(self):
data = { data = {
"channel": "p_" + self.uid, "channel": "p_" + self.uid,
"clientid": self.client_id, "clientid": self._client_id,
"partition": -2, "partition": -2,
"cap": 0, "cap": 0,
"uid": self.uid, "uid": self.uid,
@@ -2394,7 +2394,7 @@ class Client(object):
"msgs_recv": 0, "msgs_recv": 0,
"sticky_token": self.sticky, "sticky_token": self.sticky,
"sticky_pool": self.pool, "sticky_pool": self.pool,
"clientid": self.client_id, "clientid": self._client_id,
"state": "active" if self._markAlive else "offline", "state": "active" if self._markAlive else "offline",
} }
return self._get(self.req_url.STICKY, data, fix_request=True, as_json=True) return self._get(self.req_url.STICKY, data, fix_request=True, as_json=True)