mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 11:18:51 +02:00
ircd:Ⓜ️:dbs: Additional cleanup w/ integrated type checking.
This commit is contained in:
parent
5958e73ff8
commit
6f8beb26c8
1 changed files with 6 additions and 32 deletions
|
@ -641,10 +641,7 @@ ircd::m::dbs::_index_event_refs_m_relates(db::txn &txn,
|
||||||
json::get<"content"_>(event)
|
json::get<"content"_>(event)
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!content.has("m.relates_to"))
|
if(!content.has("m.relates_to", json::OBJECT))
|
||||||
return;
|
|
||||||
|
|
||||||
if(unlikely(!json::type(content["m.relates_to"], json::OBJECT)))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const json::object &m_relates_to
|
const json::object &m_relates_to
|
||||||
|
@ -726,10 +723,7 @@ ircd::m::dbs::_prefetch_event_refs_m_relates(db::txn &txn,
|
||||||
json::get<"content"_>(event)
|
json::get<"content"_>(event)
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!content.has("m.relates_to"))
|
if(!content.has("m.relates_to", json::OBJECT))
|
||||||
return false;
|
|
||||||
|
|
||||||
if(unlikely(!json::type(content["m.relates_to"], json::OBJECT)))
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const json::object &m_relates_to
|
const json::object &m_relates_to
|
||||||
|
@ -765,10 +759,7 @@ ircd::m::dbs::_index_event_refs_m_relates_m_reply(db::txn &txn,
|
||||||
json::get<"content"_>(event)
|
json::get<"content"_>(event)
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!content.has("m.relates_to"))
|
if(!content.has("m.relates_to", json::OBJECT))
|
||||||
return;
|
|
||||||
|
|
||||||
if(unlikely(!json::type(content["m.relates_to"], json::OBJECT)))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const json::object &m_relates_to
|
const json::object &m_relates_to
|
||||||
|
@ -776,20 +767,9 @@ ircd::m::dbs::_index_event_refs_m_relates_m_reply(db::txn &txn,
|
||||||
content["m.relates_to"]
|
content["m.relates_to"]
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!m_relates_to.has("m.in_reply_to"))
|
if(!m_relates_to.has("m.in_reply_to", json::OBJECT))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(unlikely(!json::type(m_relates_to.get("m.in_reply_to"), json::OBJECT)))
|
|
||||||
{
|
|
||||||
log::derror
|
|
||||||
{
|
|
||||||
log, "Cannot index m.in_reply_to in %s; not an OBJECT.",
|
|
||||||
string_view{event.event_id}
|
|
||||||
};
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const json::object &m_in_reply_to
|
const json::object &m_in_reply_to
|
||||||
{
|
{
|
||||||
m_relates_to["m.in_reply_to"]
|
m_relates_to["m.in_reply_to"]
|
||||||
|
@ -867,10 +847,7 @@ ircd::m::dbs::_prefetch_event_refs_m_relates_m_reply(db::txn &txn,
|
||||||
json::get<"content"_>(event)
|
json::get<"content"_>(event)
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!content.has("m.relates_to"))
|
if(!content.has("m.relates_to", json::OBJECT))
|
||||||
return false;
|
|
||||||
|
|
||||||
if(unlikely(!json::type(content["m.relates_to"], json::OBJECT)))
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const json::object &m_relates_to
|
const json::object &m_relates_to
|
||||||
|
@ -878,10 +855,7 @@ ircd::m::dbs::_prefetch_event_refs_m_relates_m_reply(db::txn &txn,
|
||||||
content["m.relates_to"]
|
content["m.relates_to"]
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!m_relates_to.has("m.in_reply_to"))
|
if(!m_relates_to.has("m.in_reply_to", json::OBJECT))
|
||||||
return false;
|
|
||||||
|
|
||||||
if(unlikely(!json::type(m_relates_to.get("m.in_reply_to"), json::OBJECT)))
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const json::object &m_in_reply_to
|
const json::object &m_in_reply_to
|
||||||
|
|
Loading…
Reference in a new issue