X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=43854bb40f7b7e8d1486edb47d41e3a092fa7063;hb=24a4eb9699eb0eb96c74e9fb86a4d40d5a2975fe;hp=08220d4bb2c1c9fc541b122d43f29e6000831d9b;hpb=8a3cae686b9067b43055a5d3ee7ba3313b88f495;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 08220d4bb2..43854bb40f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -11,14 +11,17 @@ 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\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
-use Friendica\Model\Profile;
use Friendica\Model\Item;
+use Friendica\Model\Profile;
+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;
@@ -134,7 +137,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 (!DBM::is_result($obj)) {
+ if (!DBA::isResult($obj)) {
return;
}
@@ -226,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'];
@@ -262,14 +265,20 @@ function localize_item(&$item)
}
if (activity_match($item['verb'], ACTIVITY_TAG)) {
- $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+ $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 (!DBM::is_result($obj)) {
+ if (!DBA::isResult($obj)) {
return;
}
- $author = '[url=' . Contact::magicLinkById($item['author-id']) . ']' . $item['author-name'] . '[/url]';
- $objauthor = '[url=' . Contact::magicLinkById($obj['author-id']) . ']' . $obj['author-name'] . '[/url]';
+ $author_arr = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
+
+ $author_arr = ['uid' => 0, 'id' => $obj['author-id'],
+ 'network' => $obj['author-network'], 'url' => $obj['author-link']];
+ $objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
switch ($obj['verb']) {
case ACTIVITY_POST:
@@ -314,7 +323,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 (DBM::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]';
@@ -341,7 +350,12 @@ function localize_item(&$item)
}
// add sparkle links to appropriate permalinks
- $item['plink'] = Contact::magicLinkById($item['author-id'], $item['plink']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+
+ if (!empty($item['plink'])) {
+ $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+ }
}
/**
@@ -384,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:
@@ -394,26 +432,14 @@ function visible_activity($item) {
* that are based on unique features of the calling module.
*
*/
-function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
- require_once 'mod/proxy.php';
+function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
- $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 ' : '');
@@ -445,6 +471,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
. "'; 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) {
@@ -464,27 +491,41 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
}
}
} 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"
- . "";
}
} elseif ($mode === 'community') {
$items = conversation_add_children($items, true, $order, $uid);
$profile_owner = 0;
+
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";
}
@@ -511,11 +552,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
$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::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
if (!local_user()) {
@@ -537,20 +578,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
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 = '';
@@ -558,25 +589,20 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
$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;
}
- if ($item['network'] == NETWORK_FEED) {
- $item['author-avatar'] = $item['contact-avatar'];
- $item['author-name'] = $item['contact-name'];
- $item['owner-avatar'] = $item['contact-avatar'];
- $item['owner-name'] = $item['contact-name'];
- }
-
- $profile_name = (strlen($item['author-name']) ? $item['author-name'] : $item['name']);
- if ($item['author-link'] && !$item['author-name']) {
+ $profile_name = $item['author-name'];
+ if (!empty($item['author-link']) && empty($item['author-name'])) {
$profile_name = $item['author-link'];
}
- $tags = \Friendica\Model\Term::populateTagsFromItem($item);
+ $tags = Term::populateTagsFromItem($item);
- $profile_link = Contact::magicLinkbyId($item['author-id']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_link = Contact::magicLinkbyContact($author);
if (strpos($profile_link, 'redir/') === 0) {
$sparkle = ' sparkle';
@@ -628,17 +654,17 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
$tmp_item = [
'template' => $tpl,
- 'id' => (($preview) ? 'P0' : $item['item_id']),
- 'guid' => (($preview) ? 'Q0' : $item['guid']),
+ 'id' => ($preview ? 'P0' : $item['id']),
+ 'guid' => ($preview ? 'Q0' : $item['guid']),
'network' => $item['network'],
- 'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
+ 'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']),
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item),
'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,
@@ -657,7 +683,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
'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,
@@ -676,7 +702,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
$arr = ['item' => $item, 'output' => $tmp_item];
Addon::callHooks('display_item', $arr);
- $threads[$threadsid]['id'] = $item['item_id'];
+ $threads[$threadsid]['id'] = $item['id'];
$threads[$threadsid]['network'] = $item['network'];
$threads[$threadsid]['items'] = [$arr['output']];
@@ -693,24 +719,15 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
* 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;
}
@@ -718,6 +735,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
continue;
}
+ /// @todo Check if this call is needed or not
+ $arr = ['item' => $item];
Addon::callHooks('display_item', $arr);
$item['pagedrop'] = $page_dropping;
@@ -760,7 +779,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
*
* @return array items with parents and comments
*/
-function conversation_add_children($parents, $block_authors, $order, $uid) {
+function conversation_add_children(array $parents, $block_authors, $order, $uid) {
$max_comments = Config::get('system', 'max_comments', 100);
$params = ['order' => ['uid', 'commented' => true]];
@@ -788,7 +807,7 @@ function conversation_add_children($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::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
}
@@ -810,15 +829,17 @@ function item_photo_menu($item) {
$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
}
- $profile_link = Contact::magicLinkById($item['author-id']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_link = Contact::magicLinkbyContact($author);
$sparkle = (strpos($profile_link, 'redir/') === 0);
$cid = 0;
$network = '';
$rel = 0;
$condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
- $contact = dba::selectFirst('contact', ['id', 'network', 'rel'], $condition);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
+ if (DBA::isResult($contact)) {
$cid = $contact['id'];
$network = $contact['network'];
$rel = $contact['rel'];
@@ -835,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;
}
}
@@ -851,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::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
@@ -915,7 +936,9 @@ function builtin_activity_puller($item, &$conv_responses) {
}
if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
- $url = Contact::MagicLinkbyId($item['author-id']);
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $url = Contact::magicLinkbyContact($author);
if (strpos($url, 'redir/') === 0) {
$sparkle = ' class="sparkle" ';
}
@@ -1068,21 +1091,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$delitems' => L10n::t("Delete item\x28s\x29?")
]);
- $tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, [
- '$newpost' => 'true',
- '$baseurl' => System::baseUrl(true),
- '$geotag' => $geotag,
- '$nickname' => $x['nickname'],
- '$ispublic' => L10n::t('Visible to everybody'),
- '$linkurl' => L10n::t('Please enter a link URL:'),
- '$vidurl' => L10n::t("Please enter a video link/URL:"),
- '$audurl' => L10n::t("Please enter an audio link/URL:"),
- '$term' => L10n::t('Tag term:'),
- '$fileas' => L10n::t('Save to Folder:'),
- '$whereareu' => L10n::t('Where are you right now?')
- ]);
-
$jotplugins = '';
Addon::callHooks('jot_tool', $jotplugins);
@@ -1137,7 +1145,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$wait' => L10n::t('Please wait'),
'$permset' => L10n::t('Permission settings'),
'$shortpermset' => L10n::t('permissions'),
- '$ptyp' => $notes_cid ? 'note' : 'wall',
+ '$wall' => $notes_cid ? 0 : 1,
+ '$posttype' => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE,
'$content' => defaults($x, 'content', ''),
'$post_id' => defaults($x, 'post_id', ''),
'$baseurl' => System::baseUrl(true),
@@ -1323,10 +1332,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;
}
@@ -1424,7 +1439,7 @@ function get_responses(array $conv_responses, array $response_verbs, $ob, array
$ret = [];
foreach ($response_verbs as $v) {
$ret[$v] = [];
- $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
+ $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], 0);
$ret[$v]['list'] = defaults($conv_responses[$v], $item['uri'] . '-l', []);
$ret[$v]['self'] = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
if (count($ret[$v]['list']) > MAX_LIKERS) {