friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reformatting

pull/10750/head
Michael 2021-09-23 21:53:52 +00:00
parent a6c85f6106
commit f696fce824
1 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/Content/Conversation.php
View File

@ -139,10 +139,10 @@ class Conversation
if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != GRAVITY_PARENT)) { if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != GRAVITY_PARENT)) {
$author = [ $author = [
'uid' => 0, 'uid' => 0,
'id' => $activity['author-id'], 'id' => $activity['author-id'],
'network' => $activity['author-network'], 'network' => $activity['author-network'],
'url' => $activity['author-link'] 'url' => $activity['author-link']
]; ];
$url = Contact::magicLinkByContact($author); $url = Contact::magicLinkByContact($author);
if (strpos($url, 'redir/') === 0) { if (strpos($url, 'redir/') === 0) {
@ -164,7 +164,7 @@ class Conversation
if (!isset($conv_responses[$mode][$activity['thr-parent-id']])) { if (!isset($conv_responses[$mode][$activity['thr-parent-id']])) {
$conv_responses[$mode][$activity['thr-parent-id']] = [ $conv_responses[$mode][$activity['thr-parent-id']] = [
'links' => [], 'links' => [],
'self' => 0, 'self' => 0,
]; ];
} elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent-id']]['links'])) { } elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent-id']]['links'])) {
// only list each unique author once // only list each unique author once
@ -238,11 +238,11 @@ class Conversation
$explikers = ''; $explikers = '';
switch ($verb) { switch ($verb) {
case 'like': case 'like':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> like this', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> like this', $spanatts, $total);
$explikers = $this->l10n->t('%s like this.', $likers); $explikers = $this->l10n->t('%s like this.', $likers);
break; break;
case 'dislike': case 'dislike':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> don\'t like this', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> don\'t like this', $spanatts, $total);
$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':
@ -250,15 +250,15 @@ class Conversation
$explikers = $this->l10n->t('%s attend.', $likers); $explikers = $this->l10n->t('%s attend.', $likers);
break; break;
case 'attendno': case 'attendno':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> don\'t attend', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> don\'t attend', $spanatts, $total);
$explikers = $this->l10n->t('%s don\'t attend.', $likers); $explikers = $this->l10n->t('%s don\'t attend.', $likers);
break; break;
case 'attendmaybe': case 'attendmaybe':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $total);
$explikers = $this->l10n->t('%s attend maybe.', $likers); $explikers = $this->l10n->t('%s attend maybe.', $likers);
break; break;
case 'announce': case 'announce':
$phrase = $this->l10n->t('<span %1$s>%2$d people</span> reshared this', $spanatts, $total); $phrase = $this->l10n->t('<span %1$s>%2$d people</span> reshared this', $spanatts, $total);
$explikers = $this->l10n->t('%s reshared this.', $likers); $explikers = $this->l10n->t('%s reshared this.', $likers);
break; break;
} }
@ -321,33 +321,33 @@ class Conversation
$tpl = Renderer::getMarkupTemplate("jot.tpl"); $tpl = Renderer::getMarkupTemplate("jot.tpl");
$o .= Renderer::replaceMacros($tpl, [ $o .= Renderer::replaceMacros($tpl, [
'$new_post' => $this->l10n->t('New Post'), '$new_post' => $this->l10n->t('New Post'),
'$return_path' => $this->args->getQueryString(), '$return_path' => $this->args->getQueryString(),
'$action' => 'item', '$action' => 'item',
'$share' => ($x['button'] ?? '') ?: $this->l10n->t('Share'), '$share' => ($x['button'] ?? '') ?: $this->l10n->t('Share'),
'$loading' => $this->l10n->t('Loading...'), '$loading' => $this->l10n->t('Loading...'),
'$upload' => $this->l10n->t('Upload photo'), '$upload' => $this->l10n->t('Upload photo'),
'$shortupload' => $this->l10n->t('upload photo'), '$shortupload' => $this->l10n->t('upload photo'),
'$attach' => $this->l10n->t('Attach file'), '$attach' => $this->l10n->t('Attach file'),
'$shortattach' => $this->l10n->t('attach file'), '$shortattach' => $this->l10n->t('attach file'),
'$edbold' => $this->l10n->t('Bold'), '$edbold' => $this->l10n->t('Bold'),
'$editalic' => $this->l10n->t('Italic'), '$editalic' => $this->l10n->t('Italic'),
'$eduline' => $this->l10n->t('Underline'), '$eduline' => $this->l10n->t('Underline'),
'$edquote' => $this->l10n->t('Quote'), '$edquote' => $this->l10n->t('Quote'),
'$edcode' => $this->l10n->t('Code'), '$edcode' => $this->l10n->t('Code'),
'$edimg' => $this->l10n->t('Image'), '$edimg' => $this->l10n->t('Image'),
'$edurl' => $this->l10n->t('Link'), '$edurl' => $this->l10n->t('Link'),
'$edattach' => $this->l10n->t('Link or Media'), '$edattach' => $this->l10n->t('Link or Media'),
'$edvideo' => $this->l10n->t('Video'), '$edvideo' => $this->l10n->t('Video'),
'$setloc' => $this->l10n->t('Set your location'), '$setloc' => $this->l10n->t('Set your location'),
'$shortsetloc' => $this->l10n->t('set location'), '$shortsetloc' => $this->l10n->t('set location'),
'$noloc' => $this->l10n->t('Clear browser location'), '$noloc' => $this->l10n->t('Clear browser location'),
'$shortnoloc' => $this->l10n->t('clear location'), '$shortnoloc' => $this->l10n->t('clear location'),
'$title' => $x['title'] ?? '', '$title' => $x['title'] ?? '',
'$placeholdertitle' => $this->l10n->t('Set title'), '$placeholdertitle' => $this->l10n->t('Set title'),
'$category' => $x['category'] ?? '', '$category' => $x['category'] ?? '',
'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? $this->l10n->t("Categories \x28comma-separated list\x29") : '', '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? $this->l10n->t("Categories \x28comma-separated list\x29") : '',
'$scheduled_at' => Temporal::getDateTimeField( '$scheduled_at' => Temporal::getDateTimeField(
new \DateTime(), new \DateTime(),
new \DateTime('now + 6 months'), new \DateTime('now + 6 months'),
null, null,
@ -641,56 +641,56 @@ class Conversation
} }
$tmp_item = [ $tmp_item = [
'template' => $tpl, 'template' => $tpl,
'id' => ($preview ? 'P0' : $item['id']), 'id' => ($preview ? 'P0' : $item['id']),
'guid' => ($preview ? 'Q0' : $item['guid']), 'guid' => ($preview ? 'Q0' : $item['guid']),
'commented' => $item['commented'], 'commented' => $item['commented'],
'received' => $item['received'], 'received' => $item['received'],
'created_date' => $item['created'], 'created_date' => $item['created'],
'uriid' => $item['uri-id'], 'uriid' => $item['uri-id'],
'network' => $item['network'], 'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']), 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']), 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
'linktitle' => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']), 'linktitle' => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link, 'profile_url' => $profile_link,
'item_photo_menu_html' => $this->item->photoMenu($item, $formSecurityToken), 'item_photo_menu_html' => $this->item->photoMenu($item, $formSecurityToken),
'name' => $profile_name, 'name' => $profile_name,
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'lock' => false, 'lock' => false,
'thumb' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)), 'thumb' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)),
'title' => $title, 'title' => $title,
'body_html' => $body_html, 'body_html' => $body_html,
'tags' => $tags['tags'], 'tags' => $tags['tags'],
'hashtags' => $tags['hashtags'], 'hashtags' => $tags['hashtags'],
'mentions' => $tags['mentions'], 'mentions' => $tags['mentions'],
'implicit_mentions' => $tags['implicit_mentions'], 'implicit_mentions' => $tags['implicit_mentions'],
'txt_cats' => $this->l10n->t('Categories:'), 'txt_cats' => $this->l10n->t('Categories:'),
'txt_folders' => $this->l10n->t('Filed under:'), 'txt_folders' => $this->l10n->t('Filed under:'),
'has_cats' => ((count($categories)) ? 'true' : ''), 'has_cats' => ((count($categories)) ? 'true' : ''),
'has_folders' => ((count($folders)) ? 'true' : ''), 'has_folders' => ((count($folders)) ? 'true' : ''),
'categories' => $categories, 'categories' => $categories,
'folders' => $folders, 'folders' => $folders,
'text' => strip_tags($body_html), 'text' => strip_tags($body_html),
'localtime' => DateTimeFormat::local($item['created'], 'r'), 'localtime' => DateTimeFormat::local($item['created'], 'r'),
'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])), 'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
'location_html' => $location_html, 'location_html' => $location_html,
'indent' => '', 'indent' => '',
'owner_name' => '', 'owner_name' => '',
'owner_url' => '', 'owner_url' => '',
'owner_photo' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)), 'owner_photo' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
'plink' => ItemModel::getPlink($item), 'plink' => ItemModel::getPlink($item),
'edpost' => false, 'edpost' => false,
'isstarred' => 'unstarred', 'isstarred' => 'unstarred',
'star' => false, 'star' => false,
'drop' => $drop, 'drop' => $drop,
'vote' => $likebuttons, 'vote' => $likebuttons,
'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,
]; ];
$arr = ['item' => $item, 'output' => $tmp_item]; $arr = ['item' => $item, 'output' => $tmp_item];
@ -805,11 +805,13 @@ class Conversation
if (!empty($activity)) { if (!empty($activity)) {
if (($row['gravity'] == GRAVITY_PARENT)) { if (($row['gravity'] == GRAVITY_PARENT)) {
$row['post-reason'] = ItemModel::PR_ANNOUNCEMENT; $row['post-reason'] = ItemModel::PR_ANNOUNCEMENT;
$row = array_merge($row, $activity);
$row = array_merge($row, $activity);
$contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']); $contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']);
$row['causer-link'] = $contact['url'];
$row['causer-link'] = $contact['url'];
$row['causer-avatar'] = $contact['thumb']; $row['causer-avatar'] = $contact['thumb'];
$row['causer-name'] = $contact['name']; $row['causer-name'] = $contact['name'];
} elseif (($row['gravity'] == GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) && } elseif (($row['gravity'] == GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
($row['author-id'] == $activity['causer-id'])) { ($row['author-id'] == $activity['causer-id'])) {
return $row; return $row;
@ -837,10 +839,10 @@ class Conversation
break; break;
case ItemModel::PR_ANNOUNCEMENT: case ItemModel::PR_ANNOUNCEMENT:
if (!empty($row['causer-id']) && $this->pConfig->get(local_user(), 'system', 'display_resharer')) { if (!empty($row['causer-id']) && $this->pConfig->get(local_user(), 'system', 'display_resharer')) {
$row['owner-id'] = $row['causer-id']; $row['owner-id'] = $row['causer-id'];
$row['owner-link'] = $row['causer-link']; $row['owner-link'] = $row['causer-link'];
$row['owner-avatar'] = $row['causer-avatar']; $row['owner-avatar'] = $row['causer-avatar'];
$row['owner-name'] = $row['causer-name']; $row['owner-name'] = $row['causer-name'];
} }
if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) { if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {