X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=682bc1455509fb73f2e71eb8d59e74b389bec002;hb=6f7ec1dc0c7aa9ce313c9e00eaec5711e5839541;hp=1c97a1abe4e074ff1b5b8875c3ba01245cb75e63;hpb=924869ab5b75fd496014a1b7ca1240a6df939fc6;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index 1c97a1abe4..682bc14555 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -8,8 +8,8 @@ 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\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; @@ -117,6 +117,10 @@ function item_redir_and_replace_images($body, $images, $cid) { /** * Render actions localized + * + * @param $item + * @throws ImagickException + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function localize_item(&$item) { @@ -172,6 +176,7 @@ function localize_item(&$item) $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; + $bodyverb = ''; if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s'); } elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { @@ -367,6 +372,8 @@ function localize_item(&$item) /** * Count the total of comments on this item and its desendants * @TODO proper type-hint + doc-tag + * @param $item + * @return int */ function count_descendants($item) { $total = count($item['children']); @@ -389,7 +396,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]; + $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW]; foreach ($hidden_activities as $act) { if (activity_match($item['verb'], $act)) { return false; @@ -436,7 +443,17 @@ function conv_get_blocklist() * The $mode parameter decides between the various renderings and also * figures out how to determine page owner and other contextual items * that are based on unique features of the calling module. - * + * @param App $a + * @param array $items + * @param Pager $pager + * @param $mode + * @param $update + * @param bool $preview + * @param string $order + * @param int $uid + * @return string + * @throws ImagickException + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function conversation(App $a, array $items, Pager $pager, $mode, $update, $preview = false, $order = 'commented', $uid = 0) { @@ -497,7 +514,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ } } } elseif ($mode === 'notes') { - $items = conversation_add_children($items, false, $order, $uid); + $items = conversation_add_children($items, false, $order, local_user()); $profile_owner = local_user(); if (!$update) { @@ -543,7 +560,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ } $cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview]; - Addon::callHooks('conversation_start',$cb); + Hook::callAll('conversation_start',$cb); $items = $cb['items']; @@ -615,7 +632,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ } $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => '']; - Addon::callHooks('render_location',$locate); + Hook::callAll('render_location',$locate); $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); @@ -706,7 +723,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ ]; $arr = ['item' => $item, 'output' => $tmp_item]; - Addon::callHooks('display_item', $arr); + Hook::callAll('display_item', $arr); $threads[$threadsid]['id'] = $item['id']; $threads[$threadsid]['network'] = $item['network']; @@ -743,7 +760,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ /// @todo Check if this call is needed or not $arr = ['item' => $item]; - Addon::callHooks('display_item', $arr); + Hook::callAll('display_item', $arr); $item['pagedrop'] = $page_dropping; @@ -783,7 +800,11 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ * * @param array $parents Parent items * + * @param $block_authors + * @param $order + * @param $uid * @return array items with parents and comments + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function conversation_add_children(array $parents, $block_authors, $order, $uid) { $max_comments = Config::get('system', 'max_comments', 100); @@ -798,7 +819,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid) foreach ($parents AS $parent) { $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ", - $parent['uri'], local_user()]; + $parent['uri'], $uid]; if ($block_authors) { $condition[0] .= "AND NOT `author`.`hidden`"; } @@ -892,7 +913,7 @@ function item_photo_menu($item) { $args = ['item' => $item, 'menu' => $menu]; - Addon::callHooks('item_photo_menu', $args); + Hook::callAll('item_photo_menu', $args); $menu = $args['menu']; @@ -912,13 +933,14 @@ function item_photo_menu($item) { * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * Increments the count of each matching activity and adds a link to the author as needed. * - * @param array $item + * @param array $item * @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) { foreach ($conv_responses as $mode => $v) { - $url = ''; $sparkle = ''; switch ($mode) { @@ -985,15 +1007,18 @@ function builtin_activity_puller($item, &$conv_responses) { /** * Format the vote text for a profile item - * @param int $cnt = number of people who vote the item - * @param array $arr = array of pre-linked names of likers/dislikers + * + * @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 int $id = item id * @return string formatted text + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; + $phrase = ''; if ($cnt == 1) { $likers = $arr[0]; @@ -1019,25 +1044,22 @@ function format_like($cnt, array $arr, $type, $id) { } } + $phrase = ''; if ($cnt > 1) { $total = count($arr); - if ($total >= MAX_LIKERS) { - $arr = array_slice($arr, 0, MAX_LIKERS - 1); - } if ($total < MAX_LIKERS) { $last = L10n::t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); - $str = implode(', ', $arr2) . ' ' . $last; - } - if ($total >= MAX_LIKERS) { - $str = implode(', ', $arr); - $str .= L10n::t('and %d other people', $total - MAX_LIKERS); + $likers = implode(', ', $arr2) . ' ' . $last; + } else { + $arr = array_slice($arr, 0, MAX_LIKERS - 1); + $likers = implode(', ', $arr); + $likers .= L10n::t('and %d other people', $total - MAX_LIKERS); } - $likers = $str; - $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; + $explikers = ''; switch ($type) { case 'like': $phrase = L10n::t('%2$d people like this', $spanatts, $cnt); @@ -1096,7 +1118,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) ]); $jotplugins = ''; - Addon::callHooks('jot_tool', $jotplugins); + Hook::callAll('jot_tool', $jotplugins); // Private/public post links for the non-JS ACL form $private_post = 1; @@ -1198,8 +1220,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) * * @param array $item_list * @param array $parent - * @param bool $recursive - * @return type + * @param bool $recursive + * @return array */ function get_item_children(array &$item_list, array $parent, $recursive = true) { @@ -1329,6 +1351,7 @@ function smart_flatten_conversation(array $parent) * @param array $item_list A list of items belonging to one or more conversations * @param string $order Either on "created" or "commented" * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function conv_sort(array $item_list, $order) { @@ -1424,7 +1447,7 @@ function sort_thr_created_rev(array $a, array $b) * * @param array $a * @param array $b - * @return type + * @return int */ function sort_thr_commented(array $a, array $b) { @@ -1441,7 +1464,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] = []; @@ -1472,6 +1495,7 @@ function get_responses(array $conv_responses, array $response_verbs, $ob, array function get_response_button_text($v, $count) { + $return = ''; switch ($v) { case 'like': $return = L10n::tt('Like', 'Likes', $count);