From de838e982d9f914df8c5ea00b3f2ab6a12795b7d Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 30 Apr 2018 08:54:56 -0700 Subject: [PATCH] modules/federation/federation: Show depth in feds head; cleanup unused returns. --- modules/federation/federation.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/federation/federation.cc b/modules/federation/federation.cc index b0d100948..1cad7ef07 100644 --- a/modules/federation/federation.cc +++ b/modules/federation/federation.cc @@ -178,8 +178,6 @@ feds__event(const m::event::id &event_id, std::ostream &out) { out << "- " << req.origin << " " << e.what() << std::endl; } - - return; } extern "C" void @@ -226,7 +224,6 @@ feds__head(const m::room::id &room_id, catch(const std::exception &e) { out << "! " << origin << " " << e.what() << std::endl; - return; } }); @@ -243,12 +240,14 @@ feds__head(const m::room::id &room_id, { const auto code{req.get()}; const json::object &response{req}; + const json::object &event{response.at("event")}; const json::array prev_events { - response.at({"event", "prev_events"}) + event.at("prev_events") }; out << "+ " << std::setw(40) << std::left << req.origin; + out << " " << event.at("depth"); for(const json::array prev_event : prev_events) { const auto &prev_event_id @@ -266,8 +265,6 @@ feds__head(const m::room::id &room_id, { out << "- " << req.origin << " " << e.what() << std::endl; } - - return; } extern "C" void