X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=66b6d2a11cc48cb6de5862c534f34406b706c8ec;hb=c65d574ac3323e3d4b42788b58e00598176173de;hp=6ee7309ad17bd4aeb1e7cd9a5fd11712ce66f137;hpb=7f2dc4060119f49eaaefb01ce3f32907e4c7761d;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index 6ee7309ad1..66b6d2a11c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -15,6 +15,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Contact; @@ -210,8 +211,8 @@ function localize_item(&$item) foreach ($links->link as $l) { $atts = $l->attributes(); switch ($atts['rel']) { - case "alternate": $Blink = $atts['href']; - case "photo": $Bphoto = $atts['href']; + case "alternate": $Blink = $atts['href']; break; + case "photo": $Bphoto = $atts['href']; break; } } @@ -365,7 +366,7 @@ function localize_item(&$item) // 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']); + $item['plink'] = Contact::magicLinkByContact($author, $item['plink']); } } @@ -396,7 +397,7 @@ function visible_activity($item) { * likes (etc.) can apply to other things besides posts. Check if they are post children, * in which case we handle them specially */ - $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW]; + $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW, ACTIVITY2_ANNOUNCE]; foreach ($hidden_activities as $act) { if (activity_match($item['verb'], $act)) { return false; @@ -528,7 +529,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ if (!$update) { $live_update_div = '
' . "\r\n" - . ""; } } elseif ($mode === 'community') { @@ -565,8 +566,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ $items = $cb['items']; $conv_responses = [ - 'like' => ['title' => L10n::t('Likes','title')], 'dislike' => ['title' => L10n::t('Dislikes','title')], - 'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')] + 'like' => ['title' => L10n::t('Likes','title')], + 'dislike' => ['title' => L10n::t('Dislikes','title')], + 'attendyes' => ['title' => L10n::t('Attending','title')], + 'attendno' => ['title' => L10n::t('Not attending','title')], + 'attendmaybe' => ['title' => L10n::t('Might attend','title')], + 'announce' => ['title' => L10n::t('Reshares','title')] ]; // array with html for each thread (parent+comments) @@ -579,7 +584,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ if (in_array($mode, ['community', 'contacts'])) { $writable = true; } else { - $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]); + $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], Protocol::FEDERATED); } if (!local_user()) { @@ -625,7 +630,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ $author = ['uid' => 0, 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link']]; - $profile_link = Contact::magicLinkbyContact($author); + $profile_link = Contact::magicLinkByContact($author); if (strpos($profile_link, 'redir/') === 0) { $sparkle = ' sparkle'; @@ -660,51 +665,44 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ list($categories, $folders) = get_cats_and_terms($item); - $profile_name_e = $profile_name; - if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) { - $title_e = ucfirst($item['content-warning']); + $title = ucfirst($item['content-warning']); } else { - $title_e = $item['title']; + $title = $item['title']; } - $body_e = $body; - $tags_e = $tags['tags']; - $hashtags_e = $tags['hashtags']; - $mentions_e = $tags['mentions']; - $location_e = $location; - $owner_name_e = $owner_name; - $tmp_item = [ 'template' => $tpl, 'id' => ($preview ? 'P0' : $item['id']), 'guid' => ($preview ? 'Q0' : $item['guid']), 'network' => $item['network'], 'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']), + 'network_icon' => ContactSelector::networkToIcon($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, + 'name' => $profile_name, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)), - 'title' => $title_e, - 'body' => $body_e, - 'tags' => $tags_e, - 'hashtags' => $hashtags_e, - 'mentions' => $mentions_e, + 'title' => $title, + 'body' => $body, + 'tags' => $tags['tags'], + 'hashtags' => $tags['hashtags'], + 'mentions' => $tags['mentions'], + 'implicit_mentions' => $tags['implicit_mentions'], 'txt_cats' => L10n::t('Categories:'), 'txt_folders' => L10n::t('Filed under:'), 'has_cats' => ((count($categories)) ? 'true' : ''), 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, - 'text' => strip_tags($body_e), + 'text' => strip_tags($body), 'localtime' => DateTimeFormat::local($item['created'], 'r'), 'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])), - 'location' => $location_e, + 'location' => $location, 'indent' => '', - 'owner_name' => $owner_name_e, + 'owner_name' => $owner_name, 'owner_url' => $owner_url, 'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)), 'plink' => Item::getPlink($item), @@ -792,6 +790,46 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ return $o; } +/** + * Fetch all comments from a query. Additionally set the newest resharer as thread owner. + * + * @param $thread_items Database statement with thread posts + * @return array items with parents and comments + */ +function conversation_fetch_comments($thread_items) { + $comments = []; + $parentlines = []; + $lineno = 0; + $actor = []; + $received = ''; + + while ($row = Item::fetch($thread_items)) { + if (($row['verb'] == ACTIVITY2_ANNOUNCE) && !empty($row['contact-uid']) && ($row['received'] > $received) && ($row['thr-parent'] == $row['parent-uri'])) { + $actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']]; + $received = $row['received']; + } + + if ((($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && !in_array($row['network'], [Protocol::DIASPORA])) && + (empty($row['contact-uid']) || !in_array($row['network'], Protocol::NATIVE_SUPPORT))) { + $parentlines[] = $lineno; + } + + $comments[] = $row; + $lineno++; + } + + DBA::close($thread_items); + + if (!empty($actor)) { + foreach ($parentlines as $line) { + $comments[$line]['owner-link'] = $actor['link']; + $comments[$line]['owner-avatar'] = $actor['avatar']; + $comments[$line]['owner-name'] = $actor['name']; + } + } + return $comments; +} + /** * @brief Add comments to top level entries that had been fetched before * @@ -823,9 +861,10 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid) if ($block_authors) { $condition[0] .= "AND NOT `author`.`hidden`"; } - $thread_items = Item::selectForUser(local_user(), [], $condition, $params); - $comments = Item::inArray($thread_items); + $thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params); + + $comments = conversation_fetch_comments($thread_items); if (count($comments) != 0) { $items = array_merge($items, $comments); @@ -834,7 +873,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'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]); + $items[$index]['writable'] = in_array($item['network'], Protocol::FEDERATED); } } @@ -851,6 +890,8 @@ function item_photo_menu($item) { $status_link = ''; $photos_link = ''; $posts_link = ''; + $block_link = ''; + $ignore_link = ''; if (local_user() && local_user() == $item['uid'] && $item['parent'] == $item['id'] && !$item['self']) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; @@ -858,10 +899,11 @@ function item_photo_menu($item) { $author = ['uid' => 0, 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link']]; - $profile_link = Contact::magicLinkbyContact($author); + $profile_link = Contact::magicLinkByContact($author, $item['author-link']); $sparkle = (strpos($profile_link, 'redir/') === 0); $cid = 0; + $pcid = Contact::getIdForURL($item['author-link'], 0, true); $network = ''; $rel = 0; $condition = ['uid' => local_user(), 'nurl' => Strings::normaliseLink($item['author-link'])]; @@ -873,9 +915,16 @@ function item_photo_menu($item) { } if ($sparkle) { - $status_link = $profile_link . '?url=status'; - $photos_link = $profile_link . '?url=photos'; - $profile_link = $profile_link . '?url=profile'; + $status_link = $profile_link . '?tab=status'; + $photos_link = str_replace('/profile/', '/photos/', $profile_link); + $profile_link = $profile_link . '?=profile'; + } + + if (!empty($pcid)) { + $contact_url = 'contact/' . $pcid; + $posts_link = 'contact/' . $pcid . '/posts'; + $block_link = 'contact/' . $pcid . '/block'; + $ignore_link = 'contact/' . $pcid . '/ignore'; } if ($cid && !$item['self']) { @@ -883,7 +932,7 @@ function item_photo_menu($item) { $contact_url = 'contact/' . $cid; $posts_link = 'contact/' . $cid . '/posts'; - if (in_array($network, [Protocol::DFRN, Protocol::DIASPORA])) { + if (in_array($network, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA])) { $pm_url = 'message/new/' . $cid; } } @@ -896,7 +945,9 @@ function item_photo_menu($item) { L10n::t('View Photos') => $photos_link, L10n::t('Network Posts') => $posts_link, L10n::t('View Contact') => $contact_url, - L10n::t('Send PM') => $pm_url + L10n::t('Send PM') => $pm_url, + L10n::t('Block') => $block_link, + L10n::t('Ignore') => $ignore_link ]; if ($network == Protocol::DFRN) { @@ -904,7 +955,7 @@ function item_photo_menu($item) { } if ((($cid == 0) || ($rel == Contact::FOLLOWER)) && - in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) { + in_array($item['network'], Protocol::FEDERATED)) { $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']); } } else { @@ -959,6 +1010,9 @@ function builtin_activity_puller($item, &$conv_responses) { case 'attendmaybe': $verb = ACTIVITY_ATTENDMAYBE; break; + case 'announce': + $verb = ACTIVITY2_ANNOUNCE; + break; default: return; } @@ -966,7 +1020,7 @@ function builtin_activity_puller($item, &$conv_responses) { if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) { $author = ['uid' => 0, 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link']]; - $url = Contact::magicLinkbyContact($author); + $url = Contact::magicLinkByContact($author); if (strpos($url, 'redir/') === 0) { $sparkle = ' class="sparkle" '; } @@ -1041,10 +1095,12 @@ function format_like($cnt, array $arr, $type, $id) { case 'attendmaybe' : $phrase = L10n::t('%s attends maybe.', $likers); break; + case 'announce' : + $phrase = L10n::t('%s reshared this.', $likers); + break; } } - $phrase = ''; if ($cnt > 1) { $total = count($arr); if ($total < MAX_LIKERS) { @@ -1081,12 +1137,15 @@ function format_like($cnt, array $arr, $type, $id) { $phrase = L10n::t('%2$d people attend maybe', $spanatts, $cnt); $explikers = L10n::t('%s attend maybe.', $likers); break; + case 'announce': + $phrase = L10n::t('%2$d people reshared this', $spanatts, $cnt); + $explikers = L10n::t('%s reshared this.', $likers); + break; } - $expanded .= "\t" . ''; + $expanded .= "\t" . ''; } - $phrase .= EOL; $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [ '$phrase' => $phrase, '$type' => $type, @@ -1258,7 +1317,7 @@ function get_item_children(array &$item_list, array $parent, $recursive = true) function sort_item_children(array $items) { $result = $items; - usort($result, 'sort_thr_created_rev'); + usort($result, 'sort_thr_received_rev'); foreach ($result as $k => $i) { if (isset($result[$k]['children'])) { $result[$k]['children'] = sort_item_children($result[$k]['children']); @@ -1343,13 +1402,13 @@ function smart_flatten_conversation(array $parent) /** * Expands a flat list of items into corresponding tree-like conversation structures, - * sort the top-level posts either on "created" or "commented", and finally + * sort the top-level posts either on "received" or "commented", and finally * append all the items at the top level (???) * * @brief Expands a flat item list into a conversation array for display * * @param array $item_list A list of items belonging to one or more conversations - * @param string $order Either on "created" or "commented" + * @param string $order Either on "received" or "commented" * @return array * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ @@ -1381,8 +1440,8 @@ function conv_sort(array $item_list, $order) } } - if (stristr($order, 'created')) { - usort($parents, 'sort_thr_created'); + if (stristr($order, 'received')) { + usort($parents, 'sort_thr_received'); } elseif (stristr($order, 'commented')) { usort($parents, 'sort_thr_commented'); } @@ -1419,27 +1478,27 @@ function conv_sort(array $item_list, $order) } /** - * @brief usort() callback to sort item arrays by the created key + * @brief usort() callback to sort item arrays by the received key * * @param array $a * @param array $b * @return int */ -function sort_thr_created(array $a, array $b) +function sort_thr_received(array $a, array $b) { - return strcmp($b['created'], $a['created']); + return strcmp($b['received'], $a['received']); } /** - * @brief usort() callback to reverse sort item arrays by the created key + * @brief usort() callback to reverse sort item arrays by the received key * * @param array $a * @param array $b * @return int */ -function sort_thr_created_rev(array $a, array $b) +function sort_thr_received_rev(array $a, array $b) { - return strcmp($a['created'], $b['created']); + return strcmp($a['received'], $b['received']); } /** @@ -1447,7 +1506,7 @@ function sort_thr_created_rev(array $a, array $b) * * @param array $a * @param array $b - * @return int|lt + * @return int */ function sort_thr_commented(array $a, array $b) { @@ -1464,7 +1523,7 @@ function render_location_dummy(array $item) { } } -function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) { +function get_responses(array $conv_responses, array $response_verbs, array $item, Post $ob = null) { $ret = []; foreach ($response_verbs as $v) { $ret[$v] = [];