MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-26 18:38:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:event: Toggle format depending on version characteristics.

Browse source
This commit is contained in:
Jason Volk 2019-07-26 16:38:20 -07:00
parent 78a9b73976
commit 3ad9496bcf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ircd/m_event.cc
View file

@ -129,9 +129,9 @@ ircd::m::pretty_oneline(std::ostream &s,
else
s << "* ";
if(event.event_id)
if(event.event_id && event.event_id.version() != "1")
s << event.event_id << ' ';
else
else if(!event.event_id)
s << m::event::id::v4{sdbuf, event} << ' ';
if(json::get<"origin_server_ts"_>(event) != json::undefined_number)
@ -154,6 +154,9 @@ ircd::m::pretty_oneline(std::ostream &s,
if(prev.auth_events_count() || prev.prev_events_count())
s << ' ';
if(event.event_id && event.event_id.version() == "1")
s << event.event_id << ' ';
if(fmt >= 2)
{
const auto &hashes{json::get<"hashes"_>(event)};