tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

replace user_id with sender

Browse source
This commit is contained in:
Mark Haines 2014-11-19 16:38:40 +00:00
parent 97c7c34f6f
commit c5eabe3143
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/api/events/__init__.py
View file

@ -119,7 +119,7 @@ class SynapseEvent(JsonEncodedObject):
def get_pdu_json(self, time_now=None):
pdu_json = self.get_full_dict()
pdu_json.pop("destination", None)
pdu_json.pop("destinations", None)
pdu_json.pop("outlier", None)
pdu_json.pop("replaces_state", None)
pdu_json.pop("redacted", None)
@ -132,6 +132,8 @@ class SynapseEvent(JsonEncodedObject):
age = time_now - pdu_json["age_ts"]
pdu_json.setdefault("unsigned", {})["age"] = int(age)
del pdu_json["age_ts"]
user_id = pdu_json.pop("user_id")
pdu_json["sender"] = user_id
return pdu_json

3
synapse/federation/replication.py
View file

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

3
tests/federation/test_federation.py
View file

@ -100,6 +100,7 @@ class FederationTestCase(unittest.TestCase):
make_pdu(
event_id="the-pdu-id",
origin="red",
user_id="@a:red",
room_id="my-context",
type="m.topic",
origin_server_ts=123456789000,
@ -145,6 +146,7 @@ class FederationTestCase(unittest.TestCase):
make_pdu(
event_id="abc123def456",
origin="red",
user_id="@a:red",
room_id="my-context",
type="m.text",
origin_server_ts=123456789001,
@ -172,6 +174,7 @@ class FederationTestCase(unittest.TestCase):
pdu = SynapseEvent(
event_id="abc123def456",
origin="red",
user_id="@a:red",
room_id="my-context",
type="m.text",
origin_server_ts=123456789001,

3
tests/handlers/test_federation.py
View file

@ -81,8 +81,9 @@ class FederationTestCase(unittest.TestCase):
content={"msgtype": u"fooo"},
origin_server_ts=0,
event_id="$a:b",
user_id="@a:b",
origin="b",
hashes={"sha256":"PvbCLWrTBxnBsSO7/cJ76072ySTCgI/XGadESRAe02M"},
hashes={"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"},
)
self.datastore.persist_event.return_value = defer.succeed(None)