summary refs log tree commit diff
path: root/synapse/events/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-08 09:08:26 +0000
committerErik Johnston <erik@matrix.org>2014-12-08 09:08:26 +0000
commitd044121168672c657e595525af9b588c8769e9bb (patch)
tree3f79777ad368b4d5d4042a629c53146125fd15b3 /synapse/events/utils.py
parentStart making more things use EventContext rather than event.* (diff)
downloadsynapse-d044121168672c657e595525af9b588c8769e9bb.tar.xz
Various typos and bug fixes.
Diffstat (limited to 'synapse/events/utils.py')
-rw-r--r--synapse/events/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 1b05ee0a95..485f075406 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -95,4 +95,6 @@ def serialize_event(hs, e):
         d["unsigned"]["age"] = now - d["unsigned"]["age_ts"]
         del d["unsigned"]["age_ts"]
 
+    d["user_id"] = d.pop("sender", None)
+
     return d
\ No newline at end of file