Add potential debug display of implicit mentions in frio

- Refactored conversation() by removing extraneous intermediary variables

diff --git a/include/conversation.php b/include/conversation.php
index 3c52e62fc478ca40389b6917d695eab618834d62..77b96574a04c59dc26f8dc5dd07cba30973f7878 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -660,21 +660,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
                                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']),
@@ -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']),
                                        '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),

diff --git a/src/Object/Post.php b/src/Object/Post.php
index bd48dbb3d32753bd6a6ccf185edeba67c307c94f..85fd7876cb8fcf92324517f241906955f4436bff 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -366,6 +366,7 @@ class Post extends BaseObject
                        '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' : ''),

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 1fb12212537cdef1b10f18b4f2d161845623aa3d..bd069f5cd7e87f3cb6ed28784911f89f7d195a80 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -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}}
                                <span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
                        {{/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}}
                                <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}}