mirror of
https://github.com/friendica/friendica
synced 2024-12-23 04:00:15 +00:00
Add potential debug display of implicit mentions in frio
- Refactored conversation() by removing extraneous intermediary variables
This commit is contained in:
parent
8c1db51a76
commit
34bc0b0c97
3 changed files with 17 additions and 21 deletions
|
@ -660,21 +660,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
||||||
|
|
||||||
list($categories, $folders) = get_cats_and_terms($item);
|
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)) {
|
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 {
|
} 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 = [
|
$tmp_item = [
|
||||||
'template' => $tpl,
|
'template' => $tpl,
|
||||||
'id' => ($preview ? 'P0' : $item['id']),
|
'id' => ($preview ? 'P0' : $item['id']),
|
||||||
|
@ -684,27 +675,28 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
||||||
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
|
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
|
||||||
'profile_url' => $profile_link,
|
'profile_url' => $profile_link,
|
||||||
'item_photo_menu' => item_photo_menu($item),
|
'item_photo_menu' => item_photo_menu($item),
|
||||||
'name' => $profile_name_e,
|
'name' => $profile_name,
|
||||||
'sparkle' => $sparkle,
|
'sparkle' => $sparkle,
|
||||||
'lock' => $lock,
|
'lock' => $lock,
|
||||||
'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
|
'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
|
||||||
'title' => $title_e,
|
'title' => $title,
|
||||||
'body' => $body_e,
|
'body' => $body,
|
||||||
'tags' => $tags_e,
|
'tags' => $tags['tags'],
|
||||||
'hashtags' => $hashtags_e,
|
'hashtags' => $tags['hashtags'],
|
||||||
'mentions' => $mentions_e,
|
'mentions' => $tags['mentions'],
|
||||||
|
'implicit_mentions' => $tags['implicit_mentions'],
|
||||||
'txt_cats' => L10n::t('Categories:'),
|
'txt_cats' => L10n::t('Categories:'),
|
||||||
'txt_folders' => L10n::t('Filed under:'),
|
'txt_folders' => 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_e),
|
'text' => strip_tags($body),
|
||||||
'localtime' => DateTimeFormat::local($item['created'], 'r'),
|
'localtime' => DateTimeFormat::local($item['created'], 'r'),
|
||||||
'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
|
'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
|
||||||
'location' => $location_e,
|
'location' => $location,
|
||||||
'indent' => '',
|
'indent' => '',
|
||||||
'owner_name' => $owner_name_e,
|
'owner_name' => $owner_name,
|
||||||
'owner_url' => $owner_url,
|
'owner_url' => $owner_url,
|
||||||
'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
|
'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
|
||||||
'plink' => Item::getPlink($item),
|
'plink' => Item::getPlink($item),
|
||||||
|
|
|
@ -366,6 +366,7 @@ class Post extends BaseObject
|
||||||
'tags' => $tags['tags'],
|
'tags' => $tags['tags'],
|
||||||
'hashtags' => $tags['hashtags'],
|
'hashtags' => $tags['hashtags'],
|
||||||
'mentions' => $tags['mentions'],
|
'mentions' => $tags['mentions'],
|
||||||
|
'implicit_mentions' => $tags['implicit_mentions'],
|
||||||
'txt_cats' => L10n::t('Categories:'),
|
'txt_cats' => L10n::t('Categories:'),
|
||||||
'txt_folders' => L10n::t('Filed under:'),
|
'txt_folders' => L10n::t('Filed under:'),
|
||||||
'has_cats' => ((count($categories)) ? 'true' : ''),
|
'has_cats' => ((count($categories)) ? 'true' : ''),
|
||||||
|
|
|
@ -293,8 +293,11 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
{{foreach $item.mentions as $tag}}
|
{{foreach $item.mentions as $tag}}
|
||||||
<span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
|
<span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
|
{{*foreach $item.implicit_mentions as $tag}}
|
||||||
|
<span class="mention label label-default sm">{{$tag nofilter}} <i class="fa fa-eye-slash" aria-hidden="true"></i></span>
|
||||||
|
{{/foreach*}}
|
||||||
|
{{/if}}
|
||||||
{{foreach $item.folders as $cat}}
|
{{foreach $item.folders as $cat}}
|
||||||
<span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
|
<span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
|
|
Loading…
Reference in a new issue