ircd:Ⓜ️ Rename v1 to fed.

include/ircd/m/fed/fed.h

@@ -1,7 +1,7 @@
 // Matrix Construct
 //
 // Copyright (C) Matrix Construct Developers, Authors & Contributors
-// Copyright (C) 2016-2018 Jason Volk <jason@zemos.net>
+// Copyright (C) 2016-2019 Jason Volk <jason@zemos.net>
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -9,7 +9,7 @@
 // full license for this software is available in the LICENSE file.
 
 #pragma once
-#define HAVE_IRCD_M_V1_H
+#define HAVE_IRCD_M_FED_H
 
 namespace ircd::m::v1
 {

include/ircd/m/m.h

@@ -63,7 +63,7 @@ namespace ircd::m
 #include "register.h"
 #include "device.h"
 #include "request.h"
-#include "v1/v1.h"
+#include "fed/fed.h"
 #include "keys.h"
 #include "edu.h"
 #include "presence.h"

ircd/Makefile.am

@@ -171,7 +171,7 @@ libircd_la_SOURCES += m_name.cc
 libircd_la_SOURCES += m_id.cc
 libircd_la_SOURCES += m_dbs.cc
 libircd_la_SOURCES += m_room.cc
-libircd_la_SOURCES += m_v1.cc
+libircd_la_SOURCES += m_fed.cc
 libircd_la_SOURCES += m.cc
 libircd_la_SOURCES += m_event.cc
 libircd_la_SOURCES += ircd.cc

modules/client/rooms/invite.cc

@@ -121,6 +121,7 @@ ircd::m::on_invite_foreign(const event &event,
 
 ircd::m::event::id::buf
 ircd::m::invite_foreign(const event &event)
+try
 {
 	const auto &event_id
 	{
@@ -205,5 +206,17 @@ ircd::m::invite_foreign(const event &event)
 	vmopts.infolog_accept = true;
 
 	m::vm::eval(revent, vmopts);
-	return at<"event_id"_>(revent);
+	return revent.event_id;
+}
+catch(const http::error &e)
+{
+	log::error
+	{
+		"Contacting remote for invite %s :%s :%s",
+		string_view{event.event_id},
+		e.what(),
+		e.content,
+	};
+
+	throw;
 }