Issue 4507: Superblock does now work on comments as well

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 276b3e1b43a5ec481b4cabdd867c51c644e97a66..6aaf67a6eb3d9314538799816fcbe95718dd9332 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -20,6 +20,7 @@ use Friendica\Model\Term;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -135,7 +136,7 @@ function localize_item(&$item)
 
                $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
                $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
-               if (!DBA::is_result($obj)) {
+               if (!DBA::isResult($obj)) {
                        return;
                }
 
@@ -266,7 +267,7 @@ function localize_item(&$item)
                $fields = ['author-id', 'author-link', 'author-name', 'author-network',
                        'verb', 'object-type', 'resource-id', 'body', 'plink'];
                $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
-               if (!DBA::is_result($obj)) {
+               if (!DBA::isResult($obj)) {
                        return;
                }
 
@@ -321,7 +322,7 @@ function localize_item(&$item)
                if (strlen($obj->id)) {
                        $fields = ['author-link', 'author-name', 'plink'];
                        $target = Item::selectFirst($fields, ['uri' => $obj->id, 'uid' => $item['uid']]);
-                       if (DBA::is_result($target) && $target['plink']) {
+                       if (DBA::isResult($target) && $target['plink']) {
                                $Bname = $target['author-name'];
                                $Blink = $target['author-link'];
                                $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
@@ -396,6 +397,29 @@ function visible_activity($item) {
        return true;
 }
 
+function conv_get_blocklist()
+{
+       if (!local_user()) {
+               return [];
+       }
+
+       $str_blocked = PConfig::get(local_user(), 'system', 'blocked');
+       if (empty($str_blocked)) {
+               return [];
+       }
+
+       $blocklist = [];
+
+       foreach (explode(',', $str_blocked) as $entry) {
+               $cid = Contact::getIdForURL(trim($entry), 0, true);
+               if (!empty($cid)) {
+                       $blocklist[] = $cid;
+               }
+       }
+
+       return $blocklist;
+}
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
@@ -407,25 +431,13 @@ function visible_activity($item) {
  *
  */
 function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
-       require_once 'mod/proxy.php';
 
-       $ssl_state = ((local_user()) ? true : false);
+       $ssl_state = (local_user() ? true : false);
 
        $profile_owner = 0;
        $live_update_div = '';
 
-       $arr_blocked = null;
-
-       if (local_user()) {
-               $str_blocked = PConfig::get(local_user(), 'system', 'blocked');
-               if ($str_blocked) {
-                       $arr_blocked = explode(',', $str_blocked);
-                       for ($x = 0; $x < count($arr_blocked); $x ++) {
-                               $arr_blocked[$x] = trim($arr_blocked[$x]);
-                       }
-               }
-
-       }
+       $blocklist = conv_get_blocklist();
 
        $previewing = (($preview) ? ' preview ' : '');
 
@@ -477,6 +489,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                }
        } elseif ($mode === 'notes') {
                $profile_owner = local_user();
+
                if (!$update) {
                        $live_update_div = '<div id="live-notes"></div>' . "\r\n"
                                . "<script> var profile_uid = " . local_user()
@@ -484,6 +497,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                }
        } elseif ($mode === 'display') {
                $profile_owner = $a->profile['uid'];
+
                if (!$update) {
                        $live_update_div = '<div id="live-display"></div>' . "\r\n"
                                . "<script> var profile_uid = " . defaults($_SESSION, 'uid', 0) . ";"
@@ -492,6 +506,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
        } elseif ($mode === 'community') {
                $items = conversation_add_children($items, true, $order, $uid);
                $profile_owner = 0;
+
                if (!$update) {
                        $live_update_div = '<div id="live-community"></div>' . "\r\n"
                                . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
@@ -523,7 +538,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
        $page_template = get_markup_template("conversation.tpl");
 
-       if ($items && count($items)) {
+       if (!empty($items)) {
                if ($mode === 'community') {
                        $writable = true;
                } else {
@@ -549,20 +564,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        continue;
                                }
 
-                               if ($arr_blocked) {
-                                       $blocked = false;
-                                       foreach ($arr_blocked as $b) {
-                                               if ($b && link_compare($item['author-link'], $b)) {
-                                                       $blocked = true;
-                                                       break;
-                                               }
-                                       }
-                                       if ($blocked) {
-                                               continue;
-                                       }
+                               if (in_array($item['author-id'], $blocklist)) {
+                                       continue;
                                }
 
-
                                $threadsid++;
 
                                $owner_url   = '';
@@ -645,7 +650,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'name' => $profile_name_e,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => System::removedBaseUrl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
+                                       'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
                                        'title' => $title_e,
                                        'body' => $body_e,
                                        'tags' => $tags_e,
@@ -664,7 +669,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'indent' => '',
                                        'owner_name' => $owner_name_e,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
+                                       'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
                                        'plink' => get_plink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,
@@ -700,17 +705,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                         * But for now, this array respects the old style, just in case
                         */
                        foreach ($items as $item) {
-                               if ($arr_blocked) {
-                                       $blocked = false;
-                                       foreach ($arr_blocked as $b) {
-                                               if ($b && link_compare($item['author-link'], $b)) {
-                                                       $blocked = true;
-                                                       break;
-                                               }
-                                       }
-                                       if ($blocked) {
-                                               continue;
-                                       }
+                               if (in_array($item['author-id'], $blocklist)) {
+                                       continue;
                                }
 
                                // Can we put this after the visibility check?
@@ -829,7 +825,7 @@ function item_photo_menu($item) {
        $rel = 0;
        $condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
        $contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
-       if (DBA::is_result($contact)) {
+       if (DBA::isResult($contact)) {
                $cid = $contact['id'];
                $network = $contact['network'];
                $rel = $contact['rel'];
@@ -866,7 +862,7 @@ function item_photo_menu($item) {
                        $menu[L10n::t("Poke")] = $poke_link;
                }
 
-               if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
+               if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
                        in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
                        $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }
@@ -1337,10 +1333,16 @@ function conv_sort(array $item_list, $order)
                return $parents;
        }
 
+       $blocklist = conv_get_blocklist();
+
        $item_array = [];
 
        // Dedupes the item list on the uri to prevent infinite loops
        foreach ($item_list as $item) {
+               if (in_array($item['author-id'], $blocklist)) {
+                       continue;
+               }
+
                $item_array[$item['uri']] = $item;
        }