use Friendica\Core\L10n;
use Friendica\Core\PConfig;
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;
$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;
}
$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;
}
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]';
// add sparkle links to appropriate permalinks
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
- $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+
+ if (!empty($item['plink'])) {
+ $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+ }
}
/**
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:
* 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 ' : '');
}
} 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()
}
} elseif ($mode === 'display') {
$profile_owner = $a->profile['uid'];
+
if (!$update) {
$live_update_div = '<div id="live-display"></div>' . "\r\n"
- . "<script> var profile_uid = " . $_SESSION['uid'] . ";"
+ . "<script> var profile_uid = " . defaults($_SESSION, 'uid', 0) . ";"
. " var profile_page = 1; </script>";
}
} 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)
$page_template = get_markup_template("conversation.tpl");
- if ($items && count($items)) {
+ if (!empty($items)) {
if ($mode === 'community') {
$writable = true;
} else {
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 = '';
$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']];
$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),
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'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,
'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,
$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']];
* 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?
continue;
}
+ /// @todo Check if this call is needed or not
+ $arr = ['item' => $item];
Addon::callHooks('display_item', $arr);
$item['pagedrop'] = $page_dropping;
*
* @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]];
$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'];
$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']);
}
'$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),
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;
}
projects / friendica.git / blobdiff