Continued:

- merged 2 if() into one with &&
- added TODO for possible rewrite (avoid "complex" code)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/include/conversation.php b/include/conversation.php
index e617eebf387210fdcbe7f50befb755dca5c79fec..e971798c955426300fcbe7ca3acef31805624e72 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -391,10 +391,9 @@ function visible_activity($item) {
                }
        }
 
-       if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
-               if (!(x($item, 'self') && ($item['uid'] == local_user()))) {
-                       return false;
-               }
+       /// @TODO such things are unneccessary code-complexibilities and should be avoided
+       if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && !(x($item, 'self') && ($item['uid'] == local_user()))) {
+               return false;
        }
 
        return true;