summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-26 15:02:55 +0000
committerErik Johnston <erik@matrix.org>2020-10-26 15:02:55 +0000
commitff7f0e8a143656eed10ad55904849908f0799b29 (patch)
tree5b387d4ac1855c171830b06711ad91dc6ac24e13 /synapse/handlers/appservice.py
parentFix get|set_type_stream_id_for_appservice store functions (#8648) (diff)
parentFix get|set_type_stream_id_for_appservice store functions (#8648) (diff)
downloadsynapse-ff7f0e8a143656eed10ad55904849908f0799b29.tar.xz
Merge branch 'release-v1.22.0' into develop
Diffstat (limited to 'synapse/handlers/appservice.py')
-rw-r--r--synapse/handlers/appservice.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 03e9ec4d4e..3ed29a2c16 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -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.