quattro: fix shiny items with threads. fix 'tagged' template

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 7fa3fed2d3ab77b57a5555115da258670179b9a1..b8afe2213a547651b49607a973ef5f542157683a 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -63,7 +63,7 @@ class Item extends BaseObject {
                                if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
                                        continue;
                                }
-                               if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+                               if(! visible_activity($item)) {
                                        continue;
                                }
                                $child = new Item($item);
@@ -93,6 +93,7 @@ class Item extends BaseObject {
                $star = false;
                $isstarred = "unstarred";
                $indent = '';
+               $shiny = '';
                $osparkle = '';
                $total_children = $this->count_descendants();
 
@@ -112,6 +113,7 @@ class Item extends BaseObject {
 
                $drop = array(
                        'dropping' => $dropping,
+                       'pagedrop' => $item['pagedrop'],
                        'select' => t('Select'), 
                        'delete' => t('Delete'),
                );
@@ -143,10 +145,20 @@ class Item extends BaseObject {
                $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
                $tags=array();
+               $hashtags = array();
+               $mentions = array();
                foreach(explode(',',$item['tag']) as $tag){
                        $tag = trim($tag);
-                       if ($tag!="") $tags[] = bbcode($tag);
-               }
+                       if ($tag!="") {
+                               $t = bbcode($tag);
+                               $tags[] = $t;
+                               if($t[0] == '#')
+                                       $hashtags[] = $t;
+                               elseif($t[0] == '@')
+                                       $mentions[] = $t;
+                       }
+
+               }        
 
                $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
                $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
@@ -188,18 +200,29 @@ class Item extends BaseObject {
                        if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
                }
 
-               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                       $indent .= ' shiny';
+               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
+                       $shiny = 'shiny';
+               }
 
                localize_item($item);
 
                $body = prepare_body($item,true);
 
+        list($categories, $folders) = get_cats_and_terms($item);
+
                $tmp_item = array(
                        'template' => $this->get_template(),
                        
                        'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
                        'tags' => $tags,
+            'hashtags' => $hashtags,
+            'mentions' => $mentions,
+                       'txt_cats' => t('Categories:'),
+                       'txt_folders' => t('Filed under:'),
+                       'has_cats' => ((count($categories)) ? 'true' : ''),
+                       'has_folders' => ((count($folders)) ? 'true' : ''),
+            'categories' => $categories,
+            'folders' => $folders,            
                        'body' => template_escape($body),
                        'text' => strip_tags(template_escape($body)),
                        'id' => $this->get_id(),
@@ -220,6 +243,7 @@ class Item extends BaseObject {
                        'lock' => $lock,
                        'location' => template_escape($location),
                        'indent' => $indent,
+                       'shiny' => $shiny,
                        'owner_url' => $this->get_owner_url(),
                        'owner_photo' => $this->get_owner_photo(),
                        'owner_name' => template_escape($this->get_owner_name()),
@@ -254,6 +278,8 @@ class Item extends BaseObject {
                        if(($nb_children > 2) || ($thread_level > 1)) {
                                $result['children'][0]['comment_firstcollapsed'] = true;
                                $result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+                               $result['children'][0]['hidden_comments_num'] = $total_children;
+                               $result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
                                $result['children'][0]['hide_text'] = t('show more');
                                if($thread_level > 1) {
                                        $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
@@ -264,6 +290,11 @@ class Item extends BaseObject {
                        }
                }
                
+        if ($this->is_toplevel()) {
+            $result['total_comments_num'] = "$total_children";
+            $result['total_comments_text'] = tt('comment', 'comments', $total_children);
+        }
+        
                $result['private'] = $item['private'];
                $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
 
@@ -304,11 +335,9 @@ class Item extends BaseObject {
                 * Only add what will be displayed
                 */
                if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
-                       logger('[WARN] Item::add_child : Item is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
                        return false;
                }
-               if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
-                       logger('[WARN] Item::add_child : Item is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
+               if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
                        return false;
                }
                
@@ -493,7 +522,8 @@ class Item extends BaseObject {
         *      _ false on failure
         */
        private function get_comment_box($indent) {
-               if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
+               $a = $this->get_app();
+               if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
                        return '';
                }
                
@@ -505,7 +535,6 @@ class Item extends BaseObject {
                        $ww = 'ww';
 
                if($conv->is_writable() && $this->is_writable()) {
-                       $a = $this->get_app();
                        $qc = $qcomment =  null;
 
                        /*
@@ -519,7 +548,8 @@ class Item extends BaseObject {
                        $comment_box = replace_macros($template,array(
                                '$return_path' => '',
                                '$threaded' => $this->is_threaded(),
-                               '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+//                             '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+                               '$jsreload' => '',
                                '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
                                '$id' => $this->get_id(),
                                '$parent' => $this->get_id(),
@@ -541,7 +571,8 @@ class Item extends BaseObject {
                                '$preview' => t('Preview'),
                                '$indent' => $indent,
                                '$sourceapp' => t($a->sourcename),
-                               '$ww' => (($conv->get_mode() === 'network') ? $ww : '')
+                               '$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
+                               '$rand_num' => random_digits(12)
                        ));
                }
 
@@ -571,7 +602,6 @@ class Item extends BaseObject {
                                        $this->owner_url = zrl($a->page_contact['url']);
                                        $this->owner_photo = $a->page_contact['thumb'];
                                        $this->owner_name = $a->page_contact['name'];
-                                       $this->set_template('wall2wall');
                                        $this->wall_to_wall = true;
                                }
                                else if($this->get_data_value('owner-link')) {
@@ -593,7 +623,6 @@ class Item extends BaseObject {
 
                                                $this->owner_photo = $this->get_data_value('owner-avatar');
                                                $this->owner_name = $this->get_data_value('owner-name');
-                                               $this->set_template('wall2wall');
                                                $this->wall_to_wall = true;
                                                // If it is our contact, use a friendly redirect link
                                                if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
@@ -634,5 +663,9 @@ class Item extends BaseObject {
        private function is_visiting() {
                return $this->visiting;
        }
+
+
+
+
 }
 ?>