X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=45e5d1caa3832ad98e04544a4ca71f2283afab3d;hb=070e1e73d60295e616314c952199fd4b0b209f2d;hp=93788399aa3eb8077093409e7304b967e5c8502b;hpb=cfa68c52b9117616fa95a4639ad74e7d220d193d;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 93788399aa..45e5d1caa3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -11,6 +11,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -20,6 +21,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;
@@ -227,12 +229,12 @@ function localize_item(&$item)
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
$obj = XML::parseString($xmlhead.$item['object']);
- $links = XML::parseString($xmlhead."".unxmlify($obj->link)."");
$Bname = $obj->title;
- $Blink = "";
+ $Blink = $obj->id;
$Bphoto = "";
- foreach ($links->link as $l) {
+
+ foreach ($obj->link as $l) {
$atts = $l->attributes();
switch ($atts['rel']) {
case "alternate": $Blink = $atts['href'];
@@ -396,6 +398,30 @@ 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) {
+ // The 4th parameter guarantees that there always will be a public contact entry
+ $cid = Contact::getIdForURL(trim($entry), 0, true, ['url' => trim($entry)]);
+ 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 +433,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 ' : '');
@@ -457,6 +471,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
. "'; var profile_page = " . $a->pager['page'] . "; \r\n";
}
} elseif ($mode === 'profile') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = $a->profile['profile_uid'];
if (!$update) {
@@ -476,14 +491,18 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
}
}
} elseif ($mode === 'notes') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = local_user();
+
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
}
} elseif ($mode === 'display') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = $a->profile['uid'];
+
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
}
+ } elseif ($mode === 'contacts') {
+ $items = conversation_add_children($items, true, $order, $uid);
+ $profile_owner = 0;
+
+ if (!$update) {
+ $live_update_div = '' . "\r\n"
+ . "\r\n";
+ }
} elseif ($mode === 'search') {
$live_update_div = '' . "\r\n";
}
@@ -523,11 +552,11 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$page_template = get_markup_template("conversation.tpl");
- if ($items && count($items)) {
- if ($mode === 'community') {
+ if (!empty($items)) {
+ if (in_array($mode, ['community', 'contacts'])) {
$writable = true;
} else {
- $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+ $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
if (!local_user()) {
@@ -549,20 +578,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 = '';
@@ -570,7 +589,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$sparkle = '';
// prevent private email from leaking.
- if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+ if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
continue;
}
@@ -645,7 +664,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 +683,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,24 +719,15 @@ 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?
builtin_activity_puller($item, $conv_responses);
// Only add what is visible
- if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+ if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
continue;
}
@@ -797,7 +807,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
foreach ($items as $index => $item) {
if ($item['uid'] == 0) {
- $items[$index]['writable'] = in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+ $items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
}
@@ -846,7 +856,7 @@ function item_photo_menu($item) {
$contact_url = 'contacts/' . $cid;
$posts_link = 'contacts/' . $cid . '/posts';
- if (in_array($network, [NETWORK_DFRN, NETWORK_DIASPORA])) {
+ if (in_array($network, [Protocol::DFRN, Protocol::DIASPORA])) {
$pm_url = 'message/new/' . $cid;
}
}
@@ -862,12 +872,12 @@ function item_photo_menu($item) {
L10n::t('Send PM') => $pm_url
];
- if ($network == NETWORK_DFRN) {
+ if ($network == Protocol::DFRN) {
$menu[L10n::t("Poke")] = $poke_link;
}
- if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
- in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+ if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
+ in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
@@ -1337,10 +1347,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;
}