MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 08:42:34 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:event::append: Only query for ignores for non-self sender; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2019-09-15 19:34:16 -07:00
parent da38ffc49c
commit 56e9f5e009
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/m_event_append.cc
View file

@ -133,7 +133,12 @@ ircd::m::event::append::append(json::stack::object &object,
//assert(json::get<"origin_server_ts"_>(event));
//assert(json::get<"origin_server_ts"_>(event) != json::undefined_number);
if(has_event_idx && !defined(json::get<"state_key"_>(event)) && m::redacted(*opts.event_idx))
const bool is_state
{
defined(json::get<"state_key"_>(event))
};
if(has_event_idx && !is_state && m::redacted(*opts.event_idx))
{
log::debug
{
@ -144,9 +149,13 @@ ircd::m::event::append::append(json::stack::object &object,
return false;
}
if(!json::get<"state_key"_>(event) && has_user)
if(has_user && !is_state && *opts.user_id != json::get<"sender"_>(event))
{
const m::user::ignores ignores{*opts.user_id};
const m::user::ignores ignores
{
*opts.user_id
};
if(ignores.enforce("events") && ignores.has(json::get<"sender"_>(event)))
{
log::debug
@ -200,22 +209,21 @@ ircd::m::event::append::append(json::stack::object &object,
return true;
});
if(json::get<"state_key"_>(event) && has_event_idx)
if(is_state && has_event_idx)
{
const auto prev_idx
{
room::state::prev(*opts.event_idx)
};
if(prev_idx)
m::get(std::nothrow, prev_idx, "content", [&object]
(const json::object &content)
m::get(std::nothrow, prev_idx, "content", [&object]
(const json::object &content)
{
json::stack::member
{
json::stack::member
{
object, "prev_content", content
};
});
object, "prev_content", content
};
});
}
json::stack::object unsigned_