MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-29 00:03:45 +02:00
Code Issues Releases Wiki Activity

modules/m_receipt: Drop receipts to rooms without any local joined users; minor reorg.

Browse source
This commit is contained in:
Jason Volk 2020-12-26 09:52:15 -08:00
parent b924da17a4
commit e888bf1827
1 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
modules/m_receipt.cc
View file

@ -50,12 +50,7 @@ handle_edu_m_receipt(const m::event &event,
if(json::get<"room_id"_>(event))
return;
const auto &origin
{
json::get<"origin"_>(event)
};
if(my_host(origin))
if(my_host(json::get<"origin"_>(event)))
return;
const json::object &content
@ -63,27 +58,8 @@ handle_edu_m_receipt(const m::event &event,
at<"content"_>(event)
};
for(const auto &[_room_id, content] : content)
{
const m::room::id &room_id
{
_room_id
};
if(m::room::server_acl::enable_write && !m::room::server_acl::check(room_id, origin))
{
log::dwarning
{
m::receipt::log, "Ignoring m.receipt from '%s' in %s :denied by m.room.server_acl.",
json::get<"origin"_>(event),
string_view{room_id},
};
continue;
}
for(const auto &[room_id, content] : content)
handle_m_receipt(event, room_id, content);
}
}
void
@ -91,6 +67,41 @@ handle_m_receipt(const m::event &event,
const m::room::id &room_id,
const json::object &content_)
{
const bool relevant_room
{
m::local_joined(room_id)
};
if(!relevant_room)
{
log::dwarning
{
m::receipt::log, "Ignoring m.receipt from '%s' in %s :no local users joined.",
json::get<"origin"_>(event),
string_view{room_id},
};
return;
}
const bool access_allow
{
!m::room::server_acl::enable_write
|| m::room::server_acl::check(room_id, json::get<"origin"_>(event))
};
if(!access_allow)
{
log::dwarning
{
m::receipt::log, "Ignoring m.receipt from '%s' in %s :denied by m.room.server_acl.",
json::get<"origin"_>(event),
string_view{room_id},
};
return;
}
for(const auto &[type, content] : content_)
{
if(type == "m.read")