From c5eabe3143bc3398961ed80da041f28e545386bf Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 19 Nov 2014 16:38:40 +0000
Subject: replace user_id with sender

---
 synapse/federation/replication.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse/federation')

diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 2ed303e12d..65a53ae17c 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -582,6 +582,9 @@ class ReplicationLayer(object):
         #TODO: Check we have all the PDU keys here
         pdu_json.setdefault("hashes", {})
         pdu_json.setdefault("signatures", {})
+        sender = pdu_json.pop("sender", None)
+        if sender is not None:
+            pdu_json["user_id"] = sender
         state_hash = pdu_json.get("unsigned", {}).pop("state_hash", None)
         if state_hash is not None:
             pdu_json["state_hash"] = state_hash
-- 
cgit 1.4.1