X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=f0d121a3cae4952f9d20e96dcbfc6f0b4470c931;hb=92679de2257ac8a14f405afe83dececde8505abd;hp=0ceb9e068ceb7d58f57de918ea557829b2e8094e;hpb=5cf369c026d6ed9f22fc05da9b97707f2a4592e9;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 0ceb9e068c..f0d121a3ca 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -256,7 +256,7 @@ function localize_item(&$item)
// add zrl's to public images
$photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
if (preg_match($photo_pattern, $item['body'])) {
- $photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
+ $photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' , true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
$item['body'] = BBCode::pregReplaceInTag($photo_pattern, $photo_replace, 'url', $item['body']);
}
@@ -324,8 +324,7 @@ function conv_get_blocklist()
$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, false, ['url' => trim($entry)]);
+ $cid = Contact::getIdForURL(trim($entry), 0, false);
if (!empty($cid)) {
$blocklist[] = $cid;
}
@@ -452,8 +451,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$profile_owner = 0;
if (!$update) {
- $live_update_div = '' . "\r\n"
- . "\r\n";
}
} elseif ($mode === 'search') {
@@ -467,7 +466,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
}
$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
- Hook::callAll('conversation_start',$cb);
+ Hook::callAll('conversation_start', $cb);
$items = $cb['items'];
@@ -501,7 +500,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$writable = false;
}
- if (in_array($mode, ['network-new', 'search', 'contact-posts'])) {
+ if (in_array($mode, ['filed', 'search', 'contact-posts'])) {
/*
* "New Item View" on network page or search page results
@@ -544,11 +543,11 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
}
$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
- Hook::callAll('render_location',$locate);
+ Hook::callAll('render_location', $locate);
$location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
localize_item($item);
- if ($mode === 'network-new') {
+ if ($mode === 'filed') {
$dropping = true;
} else {
$dropping = false;
@@ -562,9 +561,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
];
$likebuttons = [
- 'like' => null,
- 'dislike' => null,
- 'share' => null,
+ 'like' => null,
+ 'dislike' => null,
+ 'share' => null,
+ 'announce' => null,
];
if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -585,6 +585,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'template' => $tpl,
'id' => ($preview ? 'P0' : $item['id']),
'guid' => ($preview ? 'Q0' : $item['guid']),
+ 'commented' => $item['commented'],
+ 'received' => $item['received'],
+ 'created_date' => $item['created'],
+ 'uriid' => $item['uri-id'],
'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
@@ -609,7 +613,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'folders' => $folders,
'text' => strip_tags($body_html),
'localtime' => DateTimeFormat::local($item['created'], 'r'),
- 'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
+ 'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
'location_html' => $location_html,
'indent' => '',
'owner_name' => '',
@@ -692,6 +696,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'$live_update' => $live_update_div,
'$remove' => DI::l10n()->t('remove'),
'$mode' => $mode,
+ '$update' => $update,
'$user' => $a->user,
'$threads' => $threads,
'$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),
@@ -705,13 +710,28 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
*
* @param mixed $thread_items Database statement with thread posts
* @param boolean $pinned Is the item pinned?
+ * @param array $activity Contact data of the resharer
*
* @return array items with parents and comments
*/
-function conversation_fetch_comments($thread_items, $pinned) {
+function conversation_fetch_comments($thread_items, bool $pinned, array $activity) {
$comments = [];
while ($row = Item::fetch($thread_items)) {
+ if (!empty($activity)) {
+ if (($row['gravity'] == GRAVITY_PARENT)) {
+ $row['post-type'] = Item::PT_ANNOUNCEMENT;
+ $row = array_merge($row, $activity);
+ $contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']);
+ $row['causer-link'] = $contact['url'];
+ $row['causer-avatar'] = $contact['thumb'];
+ $row['causer-name'] = $contact['name'];
+ } elseif (($row['gravity'] == GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
+ ($row['author-id'] == $activity['causer-id'])) {
+ continue;
+ }
+ }
+
$name = $row['causer-contact-type'] == Contact::TYPE_RELAY ? $row['causer-link'] : $row['causer-name'];
switch ($row['post-type']) {
@@ -734,7 +754,8 @@ function conversation_fetch_comments($thread_items, $pinned) {
$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
break;
case Item::PT_ANNOUNCEMENT:
- if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer') ) {
+ if (!empty($row['causer-id']) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')) {
+ $row['owner-id'] = $row['causer-id'];
$row['owner-link'] = $row['causer-link'];
$row['owner-avatar'] = $row['causer-avatar'];
$row['owner-name'] = $row['causer-name'];
@@ -804,9 +825,23 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
$items = [];
foreach ($parents AS $parent) {
- $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
- $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
- $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params);
+ if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == GRAVITY_ACTIVITY)) {
+ $condition = ["`item`.`parent-uri-id` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
+ $parent['thr-parent-id'], $uid, Verb::getID(Activity::FOLLOW)];
+ if (!empty($parent['author-id'])) {
+ $activity = ['causer-id' => $parent['author-id']];
+ foreach (['commented', 'received', 'created'] as $orderfields) {
+ if (!empty($parent[$orderfields])) {
+ $activity[$orderfields] = $parent[$orderfields];
+ }
+ }
+ }
+ } else {
+ $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)",
+ $parent['uri'], $uid, Verb::getID(Activity::FOLLOW)];
+ $activity = [];
+ }
+ $items = conversation_fetch_items($parent, $items, $condition, $block_authors, $params, $activity);
}
foreach ($items as $index => $item) {
@@ -823,21 +858,22 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
/**
* Fetch conversation items
*
- * @param array $parent
- * @param array $items
- * @param array $condition
- * @param boolean $block_authors
- * @param array $params
+ * @param array $parent Parent Item array
+ * @param array $items Item array
+ * @param array $condition SQL condition
+ * @param boolean $block_authors Don't show posts from contacts that are hidden (used on the community page)
+ * @param array $params SQL parameters
+ * @param array $activity Contact data of the resharer
* @return array
*/
-function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params) {
+function conversation_fetch_items(array $parent, array $items, array $condition, bool $block_authors, array $params, array $activity) {
if ($block_authors) {
$condition[0] .= " AND NOT `author`.`hidden`";
}
$thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity', 'post-type']), $condition, $params);
- $comments = conversation_fetch_comments($thread_items, $parent['pinned'] ?? false);
+ $comments = conversation_fetch_comments($thread_items, $parent['pinned'] ?? false, $activity);
if (count($comments) != 0) {
$items = array_merge($items, $comments);
@@ -913,13 +949,17 @@ function item_photo_menu($item) {
DI::l10n()->t('Ignore') => $ignore_link
];
+ if (!empty($item['language'])) {
+ $menu[DI::l10n()->t('Languages')] = 'javascript:alert(\'' . Item::getLanguageMessage($item) . '\');';
+ }
+
if ($network == Protocol::DFRN) {
$menu[DI::l10n()->t("Poke")] = $poke_link;
}
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
in_array($item['network'], Protocol::FEDERATED)) {
- $menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
+ $menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']) . '&auto=1';
}
} else {
$menu = [DI::l10n()->t('View Profile') => $item['author-link']];
@@ -948,13 +988,14 @@ function item_photo_menu($item) {
*
* Increments the count of each matching activity and adds a link to the author as needed.
*
- * @param array $item
+ * @param array $activity
* @param array &$conv_responses (already created with builtin activity structure)
* @return void
* @throws ImagickException
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
-function builtin_activity_puller($item, &$conv_responses) {
+function builtin_activity_puller(array $activity, array &$conv_responses)
+{
foreach ($conv_responses as $mode => $v) {
$sparkle = '';
@@ -981,48 +1022,45 @@ function builtin_activity_puller($item, &$conv_responses) {
return;
}
- if (!empty($item['verb']) && DI::activity()->match($item['verb'], $verb) && ($item['gravity'] != GRAVITY_PARENT)) {
- $author = ['uid' => 0, 'id' => $item['author-id'],
- 'network' => $item['author-network'], 'url' => $item['author-link']];
+ if (!empty($activity['verb']) && DI::activity()->match($activity['verb'], $verb) && ($activity['gravity'] != GRAVITY_PARENT)) {
+ $author = [
+ 'uid' => 0,
+ 'id' => $activity['author-id'],
+ 'network' => $activity['author-network'],
+ 'url' => $activity['author-link']
+ ];
$url = Contact::magicLinkByContact($author);
if (strpos($url, 'redir/') === 0) {
$sparkle = ' class="sparkle" ';
}
- $url = '' . htmlentities($item['author-name']) . '';
+ $link = '' . htmlentities($activity['author-name']) . '';
- if (empty($item['thr-parent'])) {
- $item['thr-parent'] = $item['parent-uri'];
- }
-
- if (!(isset($conv_responses[$mode][$item['thr-parent'] . '-l'])
- && is_array($conv_responses[$mode][$item['thr-parent'] . '-l']))) {
- $conv_responses[$mode][$item['thr-parent'] . '-l'] = [];
- }
-
- // only list each unique author once
- if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) {
- continue;
+ if (empty($activity['thr-parent'])) {
+ $activity['thr-parent'] = $activity['parent-uri'];
}
// Skip when the causer of the parent is the same than the author of the announce
- if ($verb == Activity::ANNOUNCE) {
- if (Item::exists(['uri' => $item['thr-parent'], 'uid' => $item['uid'], 'causer-id' => $item['author-id'], 'gravity' => GRAVITY_PARENT])) {
- continue;
- }
+ if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $activity['thr-parent'],
+ 'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) {
+ continue;
}
- if (!isset($conv_responses[$mode][$item['thr-parent']])) {
- $conv_responses[$mode][$item['thr-parent']] = 1;
- } else {
- $conv_responses[$mode][$item['thr-parent']] ++;
+ if (!isset($conv_responses[$mode][$activity['thr-parent']])) {
+ $conv_responses[$mode][$activity['thr-parent']] = [
+ 'links' => [],
+ 'self' => 0,
+ ];
+ } elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent']]['links'])) {
+ // only list each unique author once
+ continue;
}
- if (public_contact() == $item['author-id']) {
- $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
+ if (public_contact() == $activity['author-id']) {
+ $conv_responses[$mode][$activity['thr-parent']]['self'] = 1;
}
- $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
+ $conv_responses[$mode][$activity['thr-parent']]['links'][] = $link;
// there can only be one activity verb per item so if we found anything, we can stop looking
return;
@@ -1031,26 +1069,26 @@ function builtin_activity_puller($item, &$conv_responses) {
}
/**
- * Format the vote text for a profile item
+ * Format the activity text for an item/photo/video
*
- * @param int $cnt = number of people who vote the item
- * @param array $arr = array of pre-linked names of likers/dislikers
- * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
- * @param int $id = item id
+ * @param array $links = array of pre-linked names of actors
+ * @param string $verb = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
+ * @param int $id = item id
* @return string formatted text
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
-function format_like($cnt, array $arr, $type, $id) {
+function format_activity(array $links, $verb, $id) {
$o = '';
$expanded = '';
$phrase = '';
- if ($cnt == 1) {
- $likers = $arr[0];
+ $total = count($links);
+ if ($total == 1) {
+ $likers = $links[0];
// Phrase if there is only one liker. In other cases it will be uses for the expanded
// list which show all likers
- switch ($type) {
+ switch ($verb) {
case 'like' :
$phrase = DI::l10n()->t('%s likes this.', $likers);
break;
@@ -1070,56 +1108,51 @@ function format_like($cnt, array $arr, $type, $id) {
$phrase = DI::l10n()->t('%s reshared this.', $likers);
break;
}
- }
-
- if ($cnt > 1) {
- $total = count($arr);
+ } elseif ($total > 1) {
if ($total < MAX_LIKERS) {
- $last = DI::l10n()->t('and') . ' ' . $arr[count($arr)-1];
- $arr2 = array_slice($arr, 0, -1);
- $likers = implode(', ', $arr2) . ' ' . $last;
+ $likers = implode(', ', array_slice($links, 0, -1));
+ $likers .= ' ' . DI::l10n()->t('and') . ' ' . $links[count($links)-1];
} else {
- $arr = array_slice($arr, 0, MAX_LIKERS - 1);
- $likers = implode(', ', $arr);
- $likers .= DI::l10n()->t('and %d other people', $total - MAX_LIKERS);
+ $likers = implode(', ', array_slice($links, 0, MAX_LIKERS - 1));
+ $likers .= ' ' . DI::l10n()->t('and %d other people', $total - MAX_LIKERS);
}
- $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
+ $spanatts = "class=\"fakelink\" onclick=\"openClose('{$verb}list-$id');\"";
$explikers = '';
- switch ($type) {
+ switch ($verb) {
case 'like':
- $phrase = DI::l10n()->t('%2$d people like this', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people like this', $spanatts, $total);
$explikers = DI::l10n()->t('%s like this.', $likers);
break;
case 'dislike':
- $phrase = DI::l10n()->t('%2$d people don\'t like this', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people don\'t like this', $spanatts, $total);
$explikers = DI::l10n()->t('%s don\'t like this.', $likers);
break;
case 'attendyes':
- $phrase = DI::l10n()->t('%2$d people attend', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people attend', $spanatts, $total);
$explikers = DI::l10n()->t('%s attend.', $likers);
break;
case 'attendno':
- $phrase = DI::l10n()->t('%2$d people don\'t attend', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people don\'t attend', $spanatts, $total);
$explikers = DI::l10n()->t('%s don\'t attend.', $likers);
break;
case 'attendmaybe':
- $phrase = DI::l10n()->t('%2$d people attend maybe', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people attend maybe', $spanatts, $total);
$explikers = DI::l10n()->t('%s attend maybe.', $likers);
break;
case 'announce':
- $phrase = DI::l10n()->t('%2$d people reshared this', $spanatts, $cnt);
+ $phrase = DI::l10n()->t('%2$d people reshared this', $spanatts, $total);
$explikers = DI::l10n()->t('%s reshared this.', $likers);
break;
}
- $expanded .= "\t" . '' . $explikers . EOL . '
';
+ $expanded .= "\t" . '' . $explikers . EOL . '
';
}
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase,
- '$type' => $type,
+ '$type' => $verb,
'$id' => $id
]);
$o .= $expanded;
@@ -1150,10 +1183,9 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$jotplugins = '';
Hook::callAll('jot_tool', $jotplugins);
- // $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
$tpl = Renderer::getMarkupTemplate("jot.tpl");
- $o .= Renderer::replaceMacros($tpl,[
+ $o .= Renderer::replaceMacros($tpl, [
'$new_post' => DI::l10n()->t('New Post'),
'$return_path' => DI::args()->getQueryString(),
'$action' => 'item',