From 0a8b026ccf2d2472bb14303eaf5af8b8cf0efa5d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 3 Nov 2014 11:32:42 +0000
Subject: [PATCH] Add 'origin' key to events

---
 synapse/api/events/factory.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py
index 750096c61..9134c82ef 100644
--- a/synapse/api/events/factory.py
+++ b/synapse/api/events/factory.py
@@ -69,6 +69,10 @@ class EventFactory(object):
         kwargs["type"] = etype
         if "event_id" not in kwargs:
             kwargs["event_id"] = self.create_event_id()
+            kwargs["origin"] = self.hs.hostname
+        else:
+            ev_id = self.hs.parse_eventid(kwargs["event_id"])
+            kwargs["origin"] = ev_id.domain
 
         if "origin_server_ts" not in kwargs:
             kwargs["origin_server_ts"] = int(self.clock.time_msec())