// 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']);
}
}
* 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;
$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)
$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';
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']),
'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),
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 = [];
+ $created = '';
+
+ while ($row = Item::fetch($thread_items)) {
+ if (($row['verb'] == ACTIVITY2_ANNOUNCE) && !empty($row['contact-uid']) && ($row['created'] > $created) && ($row['thr-parent'] == $row['parent-uri'])) {
+ $actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
+ $created = $row['created'];
+ }
+ if ($row['gravity'] == GRAVITY_PARENT) {
+ $parentlines[] = $lineno;
+ }
+
+ $comments[] = $row;
+ $lineno++;
+ }
+
+ DBA::close($thread_items);
+
+ if (!empty($actor)) {
+ foreach ($parentlines as $line) {
+ if (!in_array($comments[$line]['network'], [Protocol::DIASPORA]) && !$comments[$line]['origin']) {
+ $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
*
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);
$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;';
$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'])];
}
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']) {
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) {
case 'attendmaybe':
$verb = ACTIVITY_ATTENDMAYBE;
break;
+ case 'announce':
+ $verb = ACTIVITY2_ANNOUNCE;
+ break;
default:
return;
}
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" ';
}
case 'attendmaybe' :
$phrase = L10n::t('%s attends maybe.', $likers);
break;
+ case 'announce' :
+ $phrase = L10n::t('%s reshared this.', $likers);
+ break;
}
}
$phrase = L10n::t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt);
$explikers = L10n::t('%s attend maybe.', $likers);
break;
+ case 'announce':
+ $phrase = L10n::t('<span %1$s>%2$d people</span> reshared this', $spanatts, $cnt);
+ $explikers = L10n::t('%s reshared this.', $likers);
+ break;
}
- $expanded .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</div>';
+ $expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
}
- $phrase .= EOL;
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase,
'$type' => $type,
projects / friendica.git / blobdiff