X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=47adfc0dfbf971dec2677a46669d091b9db249e7;hb=91ef9f238cd79f1546d03a557753eec2c7d09327;hp=21b700f2fe0e42de4f0c9477ecd12b462454b8a1;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 21b700f2fe..47adfc0dfb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,19 +6,24 @@
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
+use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
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 +139,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 +231,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'];
@@ -265,7 +270,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 (!DBM::is_result($obj)) {
+ if (!DBA::isResult($obj)) {
return;
}
@@ -320,7 +325,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]';
@@ -350,7 +355,8 @@ function localize_item(&$item)
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
- if (!empty($item['plink'])) {
+ // Only create a redirection to a magic link when logged in
+ if (!empty($item['plink']) && (local_user() || remote_user())) {
$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
}
}
@@ -395,6 +401,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:
@@ -405,26 +435,14 @@ function visible_activity($item) {
* that are based on unique features of the calling module.
*
*/
-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);
+function conversation(App $a, array $items, Pager $pager, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
+{
+ $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 ' : '');
@@ -453,9 +471,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
. ((x($_GET, 'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
. ((x($_GET, 'file')) ? '&file=' . $_GET['file'] : '')
- . "'; var profile_page = " . $a->pager['page'] . "; \r\n";
+ . "'; var profile_page = " . $pager->getPage() . "; \r\n";
}
} elseif ($mode === 'profile') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = $a->profile['profile_uid'];
if (!$update) {
@@ -471,18 +490,22 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$live_update_div = '' . "\r\n"
. "\r\n";
+ . "; var netargs = '?f='; var profile_page = " . $pager->getPage() . "; \r\n";
}
}
} elseif ($mode === 'notes') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = local_user();
+
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ . "; var netargs = '/?f='; var profile_page = " . $pager->getPage() . "; \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";
+ ."/?f='; var profile_page = " . $pager->getPage() . "; \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";
@@ -503,7 +536,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
if (!$update) {
- $_SESSION['return_url'] = $a->query_string;
+ $_SESSION['return_path'] = $a->query_string;
}
$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
@@ -522,11 +555,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::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
if (!local_user()) {
@@ -548,20 +581,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 = '';
@@ -569,7 +592,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;
}
@@ -578,7 +601,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$profile_name = $item['author-link'];
}
- $tags = \Friendica\Model\Term::populateTagsFromItem($item);
+ $tags = Term::populateTagsFromItem($item);
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
@@ -637,14 +660,14 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'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,
@@ -663,7 +686,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,
@@ -699,24 +722,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;
}
@@ -738,7 +752,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$threads = $conv->getTemplateData($conv_responses);
if (!$threads) {
- logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
+ Logger::log('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
$threads = [];
}
}
@@ -796,7 +810,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::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
}
@@ -827,8 +841,8 @@ function item_photo_menu($item) {
$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'];
@@ -842,10 +856,10 @@ function item_photo_menu($item) {
if ($cid && !$item['self']) {
$poke_link = 'poke/?f=&c=' . $cid;
- $contact_url = 'contacts/' . $cid;
- $posts_link = 'contacts/' . $cid . '/posts';
+ $contact_url = 'contact/' . $cid;
+ $posts_link = 'contact/' . $cid . '/posts';
- if (in_array($network, [NETWORK_DFRN, NETWORK_DIASPORA])) {
+ if (in_array($network, [Protocol::DFRN, Protocol::DIASPORA])) {
$pm_url = 'message/new/' . $cid;
}
}
@@ -861,12 +875,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 {
@@ -1071,30 +1085,13 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$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:"),
+ '$linkurl' => L10n::t('Please enter a image/video/audio/webpage URL:'),
'$term' => L10n::t('Tag term:'),
'$fileas' => L10n::t('Save to Folder:'),
'$whereareu' => L10n::t('Where are you right now?'),
'$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);
@@ -1132,12 +1129,14 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$shortupload' => L10n::t('upload photo'),
'$attach' => L10n::t('Attach file'),
'$shortattach' => L10n::t('attach file'),
- '$weblink' => L10n::t('Insert web link'),
- '$shortweblink' => L10n::t('web link'),
- '$video' => L10n::t('Insert video link'),
- '$shortvideo' => L10n::t('video link'),
- '$audio' => L10n::t('Insert audio link'),
- '$shortaudio' => L10n::t('audio link'),
+ '$edbold' => L10n::t('Bold'),
+ '$editalic' => L10n::t('Italic'),
+ '$eduline' => L10n::t('Underline'),
+ '$edquote' => L10n::t('Quote'),
+ '$edcode' => L10n::t('Code'),
+ '$edimg' => L10n::t('Image'),
+ '$edurl' => L10n::t('Link'),
+ '$edattach' => L10n::t('Link or Media'),
'$setloc' => L10n::t('Set your location'),
'$shortsetloc' => L10n::t('set location'),
'$noloc' => L10n::t('Clear browser location'),
@@ -1149,7 +1148,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),
@@ -1335,10 +1335,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;
}
@@ -1436,7 +1442,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) {