LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-07-10 16:12:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't store empty pts in messagebox

Browse Source 
This lets us rely on "not present" for "not initialized",
as opposed to having to check not present OR not empty, and
helps prevent more bugs.
This commit is contained in:
Lonami Exo 2022-01-24 11:00:20 +01:00
parent 3aa53dd981
commit 4b61ce18ff
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
telethon/_updates/messagebox.py
View File

@ -118,7 +118,7 @@ class MessageBox:
# Additional fields beyond PTS needed by `ENTRY_ACCOUNT`. # Additional fields beyond PTS needed by `ENTRY_ACCOUNT`.
date: int = 1 date: int = 1
seq: int = 0 seq: int = NO_SEQ
# Holds the entry with the closest deadline (optimization to avoid recalculating the minimum deadline). # Holds the entry with the closest deadline (optimization to avoid recalculating the minimum deadline).
next_deadline: object = None # entry next_deadline: object = None # entry
@ -146,11 +146,14 @@ class MessageBox:
Create a [`MessageBox`] from a previously known update state. Create a [`MessageBox`] from a previously known update state.
""" """
deadline = next_updates_deadline() deadline = next_updates_deadline()
self.map = {
ENTRY_ACCOUNT: State(pts=session_state.pts, deadline=deadline), self.map.clear()
ENTRY_SECRET: State(pts=session_state.qts, deadline=deadline), if session_state.pts != NO_SEQ:
**{s.channel_id: State(pts=s.pts, deadline=deadline) for s in channel_states} self.map[ENTRY_ACCOUNT] = State(pts=session_state.pts, deadline=deadline)
} if session_state.qts != NO_SEQ:
self.map[ENTRY_SECRET] = State(pts=session_state.qts, deadline=deadline)
self.map.update((s.channel_id, State(pts=s.pts, deadline=deadline)) for s in channel_states)
self.date = session_state.date self.date = session_state.date
self.seq = session_state.seq self.seq = session_state.seq
self.next_deadline = ENTRY_ACCOUNT self.next_deadline = ENTRY_ACCOUNT
@ -162,8 +165,8 @@ class MessageBox:
This should be used for persisting the state. This should be used for persisting the state.
""" """
return dict( return dict(
pts=self.map[ENTRY_ACCOUNT].pts if ENTRY_ACCOUNT in self.map else 0, pts=self.map[ENTRY_ACCOUNT].pts if ENTRY_ACCOUNT in self.map else NO_SEQ,
qts=self.map[ENTRY_SECRET].pts if ENTRY_SECRET in self.map else 0, qts=self.map[ENTRY_SECRET].pts if ENTRY_SECRET in self.map else NO_SEQ,
date=self.date, date=self.date,
seq=self.seq, seq=self.seq,
), {id: state.pts for id, state in self.map.items() if isinstance(id, int)} ), {id: state.pts for id, state in self.map.items() if isinstance(id, int)}
@ -172,7 +175,7 @@ class MessageBox:
""" """
Return true if the message box is empty and has no state yet. Return true if the message box is empty and has no state yet.
""" """
return ENTRY_ACCOUNT not in self.map or self.map[ENTRY_ACCOUNT] == NO_SEQ return ENTRY_ACCOUNT not in self.map
def check_deadlines(self): def check_deadlines(self):
""" """
@ -245,8 +248,17 @@ class MessageBox:
# updates will be fetched. # updates will be fetched.
def set_state(self, state): def set_state(self, state):
deadline = next_updates_deadline() deadline = next_updates_deadline()
self.map[ENTRY_ACCOUNT] = State(pts=state.pts, deadline=deadline)
self.map[ENTRY_SECRET] = State(pts=state.qts, deadline=deadline) if state.pts != NO_SEQ:
self.map[ENTRY_ACCOUNT] = State(pts=state.pts, deadline=deadline)
else:
self.map.pop(ENTRY_ACCOUNT, None)
if state.qts != NO_SEQ:
self.map[ENTRY_SECRET] = State(pts=state.qts, deadline=deadline)
else:
self.map.pop(ENTRY_SECRET, None)
self.date = state.date self.date = state.date
self.seq = state.seq self.seq = state.seq