matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow sending of multiple backlog messages in parallel.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-22 14:26:54 +01:00
parent 0fba3016ee
commit 6d4f69e3a2
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
matrix/commands.py
View file

@ -108,6 +108,10 @@ def hook_commands():
def matrix_fetch_old_messages(server, room_id): def matrix_fetch_old_messages(server, room_id):
room = server.rooms[room_id] room = server.rooms[room_id]
if room.backlog_pending:
return
prev_batch = room.prev_batch prev_batch = room.prev_batch
if not prev_batch: if not prev_batch:
@ -119,6 +123,7 @@ def matrix_fetch_old_messages(server, room_id):
token=prev_batch, token=prev_batch,
limit=OPTIONS.backlog_limit limit=OPTIONS.backlog_limit
) )
room.backlog_pending = True
server.send_or_queue(message) server.send_or_queue(message)

1
matrix/events.py
View file

@ -343,6 +343,7 @@ class MatrixBacklogEvent(MatrixEvent):
message.prnt(room, buf, tags) message.prnt(room, buf, tags)
room.prev_batch = self.end_token room.prev_batch = self.end_token
room.backlog_pending = False
class MatrixSyncEvent(MatrixEvent): class MatrixSyncEvent(MatrixEvent):

17
matrix/rooms.py
View file

@ -25,14 +25,15 @@ class MatrixRoom:
def __init__(self, room_id): def __init__(self, room_id):
# type: (str) -> None # type: (str) -> None
# yapf: disable # yapf: disable
self.room_id = room_id # type: str self.room_id = room_id # type: str
self.alias = room_id # type: str self.alias = room_id # type: str
self.topic = "" # type: str self.topic = "" # type: str
self.topic_author = "" # type: str self.topic_author = "" # type: str
self.topic_date = None # type: datetime.datetime self.topic_date = None # type: datetime.datetime
self.prev_batch = "" # type: str self.prev_batch = "" # type: str
self.users = dict() # type: Dict[str, MatrixUser] self.users = dict() # type: Dict[str, MatrixUser]
self.encrypted = False # type: bool self.encrypted = False # type: bool
self.backlog_pending = False # type: bool
# yapf: enable # yapf: enable