friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Style again

This commit is contained in:
Michael 2021-09-24 04:46:30 +00:00
parent 64d181c1cc
commit 8fd8241797
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Content/Conversation.php
View File

@ -192,11 +192,12 @@ class Conversation
* @return string formatted text * @return string formatted text
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function formatActivity(array $links, $verb, $id) { public function formatActivity(array $links, $verb, $id)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
$o = ''; $o = '';
$expanded = ''; $expanded = '';
$phrase = ''; $phrase = '';
$total = count($links); $total = count($links);
if ($total == 1) { if ($total == 1) {
@ -205,30 +206,30 @@ class Conversation
// Phrase if there is only one liker. In other cases it will be uses for the expanded // Phrase if there is only one liker. In other cases it will be uses for the expanded
// list which show all likers // list which show all likers
switch ($verb) { switch ($verb) {
case 'like' : case 'like':
$phrase = $this->l10n->t('%s likes this.', $likers); $phrase = $this->l10n->t('%s likes this.', $likers);
break; break;
case 'dislike' : case 'dislike':
$phrase = $this->l10n->t('%s doesn\'t like this.', $likers); $phrase = $this->l10n->t('%s doesn\'t like this.', $likers);
break; break;
case 'attendyes' : case 'attendyes':
$phrase = $this->l10n->t('%s attends.', $likers); $phrase = $this->l10n->t('%s attends.', $likers);
break; break;
case 'attendno' : case 'attendno':
$phrase = $this->l10n->t('%s doesn\'t attend.', $likers); $phrase = $this->l10n->t('%s doesn\'t attend.', $likers);
break; break;
case 'attendmaybe' : case 'attendmaybe':
$phrase = $this->l10n->t('%s attends maybe.', $likers); $phrase = $this->l10n->t('%s attends maybe.', $likers);
break; break;
case 'announce' : case 'announce':
$phrase = $this->l10n->t('%s reshared this.', $likers); $phrase = $this->l10n->t('%s reshared this.', $likers);
break; break;
} }
} elseif ($total > 1) { } elseif ($total > 1) {
if ($total < MAX_LIKERS) { if ($total < MAX_LIKERS) {
$likers = implode(', ', array_slice($links, 0, -1)); $likers = implode(', ', array_slice($links, 0, -1));
$likers .= ' ' . $this->l10n->t('and') . ' ' . $links[count($links)-1]; $likers .= ' ' . $this->l10n->t('and') . ' ' . $links[count($links) - 1];
} else { } else {
$likers = implode(', ', array_slice($links, 0, MAX_LIKERS - 1)); $likers = implode(', ', array_slice($links, 0, MAX_LIKERS - 1));
$likers .= ' ' . $this->l10n->t('and %d other people', $total - MAX_LIKERS); $likers .= ' ' . $this->l10n->t('and %d other people', $total - MAX_LIKERS);
} }
@ -246,7 +247,7 @@ class Conversation
$explikers = $this->l10n->t('%s don\'t like this.', $likers); $explikers = $this->l10n->t('%s don\'t like this.', $likers);
break; break;
case 'attendyes': case 'attendyes':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> attend', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> attend', $spanatts, $total);
$explikers = $this->l10n->t('%s attend.', $likers); $explikers = $this->l10n->t('%s attend.', $likers);
break; break;
case 'attendno': case 'attendno':
@ -268,8 +269,8 @@ class Conversation
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase, '$phrase' => $phrase,
'$type' => $verb, '$type' => $verb,
'$id' => $id '$id' => $id
]); ]);
$o .= $expanded; $o .= $expanded;
@ -592,7 +593,7 @@ class Conversation
$tags = Tag::populateFromItem($item); $tags = Tag::populateFromItem($item);
$author = ['uid' => 0, 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link']]; $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);
$sparkle = ''; $sparkle = '';
@ -686,7 +687,7 @@ class Conversation
'like_html' => '', 'like_html' => '',
'dislike_html ' => '', 'dislike_html ' => '',
'comment_html' => '', 'comment_html' => '',
'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]), 'conv' => ($preview ? '' : ['href' => 'display/' . $item['guid'], 'title'=> $this->l10n->t('View in context')]),
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => $this->l10n->t('Please wait'), 'wait' => $this->l10n->t('Please wait'),
'thread_level' => 1, 'thread_level' => 1,
@ -695,9 +696,9 @@ class Conversation
$arr = ['item' => $item, 'output' => $tmp_item]; $arr = ['item' => $item, 'output' => $tmp_item];
Hook::callAll('display_item', $arr); Hook::callAll('display_item', $arr);
$threads[$threadsid]['id'] = $item['id']; $threads[$threadsid]['id'] = $item['id'];
$threads[$threadsid]['network'] = $item['network']; $threads[$threadsid]['network'] = $item['network'];
$threads[$threadsid]['items'] = [$arr['output']]; $threads[$threadsid]['items'] = [$arr['output']];
} }
} else { } else {
@ -756,7 +757,7 @@ class Conversation
'$mode' => $mode, '$mode' => $mode,
'$update' => $update, '$update' => $update,
'$threads' => $threads, '$threads' => $threads,
'$dropping' => ($page_dropping ? $this->l10n->t('Delete Selected Items') : False), '$dropping' => ($page_dropping ? $this->l10n->t('Delete Selected Items') : false),
]); ]);
$this->profiler->stopRecording(); $this->profiler->stopRecording();
@ -794,7 +795,8 @@ class Conversation
* *
* @return array items with parents and comments * @return array items with parents and comments
*/ */
private function addRowInformation(array $row, array $activity) { private function addRowInformation(array $row, array $activity)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
if ($row['uid'] == 0) { if ($row['uid'] == 0) {
@ -886,7 +888,8 @@ class Conversation
* @return array items with parents and comments * @return array items with parents and comments
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private function addChildren(array $parents, $block_authors, $order, $uid) { private function addChildren(array $parents, $block_authors, $order, $uid)
{
$this->profiler->startRecording('rendering'); $this->profiler->startRecording('rendering');
if (count($parents) > 1) { if (count($parents) > 1) {
$max_comments = $this->config->get('system', 'max_comments', 100); $max_comments = $this->config->get('system', 'max_comments', 100);
@ -980,6 +983,7 @@ class Conversation
if ($thr_parent == $parent['uri-id']) { if ($thr_parent == $parent['uri-id']) {
$item['children'] = $this->getItemChildren($item_list, $item); $item['children'] = $this->getItemChildren($item_list, $item);
$children[] = $item; $children[] = $item;
unset($item_list[$i]); unset($item_list[$i]);
} }
@ -1059,7 +1063,7 @@ class Conversation
if (isset($child['children']) && count($child['children'])) { if (isset($child['children']) && count($child['children'])) {
// This helps counting only the regular posts // This helps counting only the regular posts
$count_post_closure = function($var) { $count_post_closure = function ($var) {
$this->profiler->stopRecording(); $this->profiler->stopRecording();
return $var['verb'] === Activity::POST; return $var['verb'] === Activity::POST;
}; };
@ -1073,7 +1077,7 @@ class Conversation
// Searches the post item in the children // Searches the post item in the children
$j = 0; $j = 0;
while($child['children'][$j]['verb'] !== Activity::POST && $j < count($child['children'])) { while ($child['children'][$j]['verb'] !== Activity::POST && $j < count($child['children'])) {
$j ++; $j ++;
} }
@ -1144,9 +1148,8 @@ class Conversation
* items and add them as children of their top-level post. * items and add them as children of their top-level post.
*/ */
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {
$parents[$i]['children'] = $parents[$i]['children'] = array_merge($this->getItemChildren($item_array, $parent, true),
array_merge($this->getItemChildren($item_array, $parent, true), $this->getItemChildren($item_array, $parent, false));
$this->getItemChildren($item_array, $parent, false));
} }
foreach ($parents as $i => $parent) { foreach ($parents as $i => $parent) {