summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-29 12:09:10 +0000
committerErik Johnston <erik@matrix.org>2019-01-29 12:09:10 +0000
commit5891a6edc89039cf4fa76217c3f34384a2aa14eb (patch)
tree9cf298044272c1929985a11d0331639fc09ea112 /synapse
parentDon't set event_id twice (diff)
downloadsynapse-5891a6edc89039cf4fa76217c3f34384a2aa14eb.tar.xz
Correctly set context.app_service
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index ac6f4fd985..37a7dca794 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -553,6 +553,8 @@ class EventCreationHandler(object):
             prev_event_ids=[p for p, _ in prev_events],
         )
         context = yield self.state.compute_event_context(event)
+        if requester:
+            context.app_service = requester.app_service
 
         self.validator.validate_new(event)