hoist receipt ACL check
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
abdda6cf32
commit
71a1285c7b
1 changed files with 10 additions and 10 deletions
|
@ -352,22 +352,22 @@ pub(crate) async fn send_transaction_message_route(
|
||||||
}
|
}
|
||||||
|
|
||||||
for (room_id, room_updates) in receipt.receipts {
|
for (room_id, room_updates) in receipt.receipts {
|
||||||
|
if services()
|
||||||
|
.rooms
|
||||||
|
.event_handler
|
||||||
|
.acl_check(origin, &room_id)
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
debug_warn!(%origin, %room_id, "received read receipt EDU from ACL'd server");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
for (user_id, user_updates) in room_updates.read {
|
for (user_id, user_updates) in room_updates.read {
|
||||||
if user_id.server_name() != origin {
|
if user_id.server_name() != origin {
|
||||||
debug_warn!(%user_id, %origin, "received read receipt EDU for user not belonging to origin");
|
debug_warn!(%user_id, %origin, "received read receipt EDU for user not belonging to origin");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if services()
|
|
||||||
.rooms
|
|
||||||
.event_handler
|
|
||||||
.acl_check(user_id.server_name(), &room_id)
|
|
||||||
.is_err()
|
|
||||||
{
|
|
||||||
debug_warn!(%user_id, %room_id, "received read receipt EDU from ACL'd user's server");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if services().rooms.state_cache.is_joined(&user_id, &room_id)? {
|
if services().rooms.state_cache.is_joined(&user_id, &room_id)? {
|
||||||
if let Some((event_id, _)) = user_updates
|
if let Some((event_id, _)) = user_updates
|
||||||
.event_ids
|
.event_ids
|
||||||
|
|
Loading…
Add table
Reference in a new issue