From 6d19fe1481820331355669ea35f46bcf6dbfd93b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sat, 6 Sep 2014 02:48:13 +0100 Subject: [PATCH] Fix generation of event ids so that they are consistent between local and remote ids --- synapse/api/events/factory.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py index a3b293e02..5e38cdbc4 100644 --- a/synapse/api/events/factory.py +++ b/synapse/api/events/factory.py @@ -47,11 +47,14 @@ class EventFactory(object): self._event_list[event_class.TYPE] = event_class self.clock = hs.get_clock() + self.hs = hs def create_event(self, etype=None, **kwargs): kwargs["type"] = etype if "event_id" not in kwargs: - kwargs["event_id"] = random_string(10) + kwargs["event_id"] = "%s@%s" % ( + random_string(10), self.hs.hostname + ) if "ts" not in kwargs: kwargs["ts"] = int(self.clock.time_msec())