From ae3980dd0002235b036086fbadd727310367dfc9 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 10 Jul 2019 07:17:55 -0700
Subject: [PATCH] ircd::m: Add the event_id to the JSON in append(event) to
 client.

---
 ircd/m_event.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ircd/m_event.cc b/ircd/m_event.cc
index e7e9c60d8..14a6e0ab6 100644
--- a/ircd/m_event.cc
+++ b/ircd/m_event.cc
@@ -432,7 +432,13 @@ ircd::m::append(json::stack::object &object,
 		}
 	}
 
-	object.append(event);
+	if(!json::get<"event_id"_>(event))
+	{
+		auto _event(event);
+		json::get<"event_id"_>(_event) = event.event_id;
+		object.append(_event);
+	}
+	else object.append(event);
 
 	if(json::get<"state_key"_>(event) && has_event_idx)
 	{