Skip to content

Commit

Permalink
Copy room serials before handling in get_new_events_as (matrix-org#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Fizzadar authored and azmeuk committed Aug 8, 2022
1 parent 903c6a6 commit 04ed45e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog.d/13392.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug in handling of typing events for appservices. Contributed by Nick @ Beeper (@fizzadar).
13 changes: 10 additions & 3 deletions synapse/handlers/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,16 +489,23 @@ async def get_new_events_as(
handler = self.get_typing_handler()

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

if not await service.is_interested_in_room(room_id, self._main_store):
continue

events.append(self._make_event_for(room_id))

return events, handler._latest_room_serial
return events, latest_room_serial

async def get_new_events(
self,
Expand Down

0 comments on commit 04ed45e

Please sign in to comment.