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

Move Client._client_id to State

Browse Source
This commit is contained in:
Mads Marquart
2019-07-27 11:27:25 +02:00
parent 3dce83de93
commit 2703d9513a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fbchat/_client.py
View File

@@ -87,7 +87,6 @@ class Client(object):
""" """
self._sticky, self._pool = (None, None) self._sticky, self._pool = (None, None)
self._seq = "0" self._seq = "0"
self._client_id = hex(int(random() * 2 ** 31))[2:]
self._default_thread_id = None self._default_thread_id = None
self._default_thread_type = None self._default_thread_type = None
self._pull_channel = 0 self._pull_channel = 0
@@ -1043,7 +1042,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._state._client_id),
"ephemeral_ttl_mode:": "0", "ephemeral_ttl_mode:": "0",
} }
@@ -2261,7 +2260,7 @@ class Client(object):
data = { data = {
"seq": self._seq, "seq": self._seq,
"channel": "p_" + self._uid, "channel": "p_" + self._uid,
"clientid": self._client_id, "clientid": self._state._client_id,
"partition": -2, "partition": -2,
"cap": 0, "cap": 0,
"uid": self._uid, "uid": self._uid,
@@ -2282,7 +2281,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._state._client_id,
"state": "active" if self._markAlive else "offline", "state": "active" if self._markAlive else "offline",
} }
return self._get( return self._get(

5
fbchat/_state.py
View File

@@ -32,6 +32,10 @@ def session_factory(user_agent=None):
return session return session
def client_id_factory():
return hex(int(random.random() * 2 ** 31))[2:]
def is_home(url): def is_home(url):
parts = _util.urlparse(url) parts = _util.urlparse(url)
# Check the urls `/home.php` and `/` # Check the urls `/home.php` and `/`
@@ -104,6 +108,7 @@ class State(object):
_revision = attr.ib() _revision = attr.ib()
_session = attr.ib(factory=session_factory) _session = attr.ib(factory=session_factory)
_counter = attr.ib(0) _counter = attr.ib(0)
_client_id = attr.ib(factory=client_id_factory)
_logout_h = attr.ib(None) _logout_h = attr.ib(None)
def get_params(self): def get_params(self):