Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copy room serials before handling in get_new_events_as (#13392)

Browse Source
This commit is contained in:
Nick Mills-Barrett 2022-07-26 18:45:27 +01:00 committed by GitHub
parent 543dc9c93e
commit bf3115584c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13392.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug in handling of typing events for appservices. Contributed by Nick @ Beeper (@fizzadar).

13
synapse/handlers/typing.py
View File

@ -489,8 +489,15 @@ class TypingNotificationEventSource(EventSource[int, JsonDict]):
handler = self.get_typing_handler() handler = self.get_typing_handler()
events = [] events = []
for room_id in handler._room_serials.keys():
if handler._room_serials[room_id] <= from_key: # Work on a copy of things here as these may change in the handler while
# waiting for the AS `is_interested_in_room` call to complete.
# Shallow copy is safe as no nested data is present.
latest_room_serial = handler._latest_room_serial
room_serials = handler._room_serials.copy()
for room_id, serial in room_serials.items():
if serial <= from_key:
continue continue
if not await service.is_interested_in_room(room_id, self._main_store): if not await service.is_interested_in_room(room_id, self._main_store):
@ -498,7 +505,7 @@ class TypingNotificationEventSource(EventSource[int, JsonDict]):
events.append(self._make_event_for(room_id)) events.append(self._make_event_for(room_id))
return events, handler._latest_room_serial return events, latest_room_serial
async def get_new_events( async def get_new_events(
self, self,