(fix): filter out blocked and unable to interact - resolves #488

7c381fff · Mark Harding · d52b7e49 · 7c381fff
Commit 7c381fff authored 1 hour ago by Mark Harding
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

conversations.php Controllers/api/v2/messenger/conversations.php +4 -2

No files found.
--- a/Controllers/api/v2/messenger/conversations.php
+++ b/Controllers/api/v2/messenger/conversations.php
@@ -74,9 +74,11 @@ class conversations implements Interfaces\Api
 $blocked = false; 
 $unavailable = false; 
 
- if (is_array($response['participants']) && false) { 
+ if (is_array($response['participants'])) { 
 foreach ($response['participants'] as $participant) { 
- if (!Security\ACL::_()->interact(Core\Session::getLoggedInUser(), $participant['guid'])) { 
+ if (Core\Security\ACL\Block::_()->isBlocked($participant['guid']) 
+ || !Security\ACL::_()->interact(Core\Session::getLoggedInUser(), $participant['guid']) 
+ ) { 
 $blocked = true; 
 break; 
 }