Merge branch 'release-v1.22.0' into develop

This commit is contained in:
Erik Johnston 2020-10-26 15:02:55 +00:00
commit ff7f0e8a14
4 changed files with 11 additions and 7 deletions

View file

@ -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.