summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 12:06:40 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 12:06:40 +0000
commit468d7f677799307ed604092f11b1fb2e7dd08d83 (patch)
tree9af69e48ee7f948e56b0bd09b3ae0e10ed1045f4 /synapse/handlers
parentMerge commit '2b7c18087' into anoa/dinsic_release_1_23_1 (diff)
parent1.22.0rc2 (diff)
downloadsynapse-468d7f677799307ed604092f11b1fb2e7dd08d83.tar.xz
Merge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/appservice.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py

index 7826387e53..c0c156599b 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py
@@ -236,16 +236,16 @@ class ApplicationServicesHandler: events = await self._handle_receipts(service) if events: self.scheduler.submit_ephemeral_events_for_as(service, events) - await self.store.set_type_stream_id_for_appservice( - service, "read_receipt", new_token - ) + await self.store.set_type_stream_id_for_appservice( + service, "read_receipt", new_token + ) elif stream_key == "presence_key": events = await self._handle_presence(service, users) if events: self.scheduler.submit_ephemeral_events_for_as(service, events) - await self.store.set_type_stream_id_for_appservice( - service, "presence", new_token - ) + await self.store.set_type_stream_id_for_appservice( + service, "presence", new_token + ) async def _handle_typing(self, service: ApplicationService, new_token: int): typing_source = self.event_sources.sources["typing"] @@ -271,7 +271,7 @@ class ApplicationServicesHandler: async def _handle_presence( self, service: ApplicationService, users: Collection[Union[str, UserID]] - ): + ) -> List[JsonDict]: events = [] # type: List[JsonDict] presence_source = self.event_sources.sources["presence"] from_key = await self.store.get_type_stream_id_for_appservice( @@ -288,7 +288,7 @@ class ApplicationServicesHandler: user=user, service=service, from_key=from_key, ) time_now = self.clock.time_msec() - presence_events = [ + events.extend( { "type": "m.presence", "sender": event.user_id, @@ -297,8 +297,9 @@ class ApplicationServicesHandler: ), } for event in presence_events - ] - events = events + presence_events + ) + + return events async def query_user_exists(self, user_id): """Check if any application service knows this user_id exists.