MessageCommand moved to DirectMessage plugin

[quix0rs-gnu-social.git] / lib / noticesection.php

diff --git a/lib/noticesection.php b/lib/noticesection.php
index 7157feafc565bd81b30f1cba4d0cee5c4dc18442..b7f38ba6655b5b583a6bebb8a481953a2c05c2b0 100644 (file)
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -39,6 +39,8 @@ define('NOTICES_PER_SECTION', 6);
  * These are the widgets that show interesting data about a person
  * group, or site.
  *
+ * @todo migrate this to use a variant of NoticeList
+ *
  * @category Widget
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
@@ -48,6 +50,8 @@ define('NOTICES_PER_SECTION', 6);
 
 class NoticeSection extends Section
 {
+    protected $maxchars = 140;
+
     function showContent()
     {
         $notices = $this->getNotices();
@@ -66,7 +70,7 @@ class NoticeSection extends Section
         return null;
     }
 
-    function showNotice($notice)
+    function showNotice(Notice $notice)
     {
         $profile = $notice->getProfile();
         if (empty($profile)) {
@@ -74,61 +78,31 @@ class NoticeSection extends Section
                                             $notice->id));
             return;
         }
-        $this->out->elementStart('li', 'hentry notice');
-        $this->out->elementStart('div', 'entry-title');
-        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->elementStart('span', 'vcard author');
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                            $profile->fullname :
-                                            $profile->nickname,
+        $this->out->elementStart('li', 'h-entry notice');
+        $this->out->elementStart('div', 'h-card');
+        $this->out->elementStart('a', array('title' => $profile->getBestName(),
                                             'href' => $profile->profileurl,
-                                            'class' => 'url'));
-        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
+                                            'class' => 'p-author u-url p-name'));
+        $avatarUrl = $profile->avatarUrl(AVATAR_MINI_SIZE);
+        $this->out->element('img', array('src' => $avatarUrl,
                                          'width' => AVATAR_MINI_SIZE,
                                          'height' => AVATAR_MINI_SIZE,
-                                         'class' => 'avatar photo',
-                                         'alt' =>  ($profile->fullname) ?
-                                         $profile->fullname :
-                                         $profile->nickname));
-        $this->out->text(' ');
-        $this->out->element('span', 'fn nickname', $profile->nickname);
+                                         'class' => 'avatar u-photo',
+                                         'alt' => $profile->getBestName()));
+        $this->out->text($profile->getBestName());
         $this->out->elementEnd('a');
-        $this->out->elementEnd('span');
 
-        $this->out->elementStart('p', 'entry-content');
-        $this->out->raw($notice->rendered);
-
-        $notice_link_cfg = common_config('site', 'notice_link');
-        if ('direct' === $notice_link_cfg) {
-            $this->out->text(' (');
-            $this->out->element('a', array('href' => $notice->uri), 'see');
-            $this->out->text(')');
-        } elseif ('attachment' === $notice_link_cfg) {
-            if ($count = $notice->hasAttachments()) {
-            // link to attachment(s) pages
-                if (1 === $count) {
-                    $f2p = File_to_post::staticGet('post_id', $notice->id);
-                    $href = common_local_url('attachment', array('attachment' => $f2p->file_id));
-                    $att_class = 'attachment';
-                } else {
-                    $href = common_local_url('attachments', array('notice' => $notice->id));
-                    $att_class = 'attachments';
-                }
+        $this->out->elementStart('p', 'e-content');
+        $this->out->text(mb_strlen($notice->content) > $this->maxchars
+            ? mb_substr($notice->content, 0, $this->maxchars) . '[…]'
+            : $notice->content);
+        $this->out->elementEnd('p');
 
-                $clip = Theme::path('images/icons/clip.png', 'base');
-                $this->out->elementStart('a', array('class' => $att_class, 'style' => "font-style: italic;", 'href' => $href, 'title' => "# of attachments: $count"));
-                $this->out->raw(" ($count&nbsp");
-                $this->out->element('img', array('style' => 'display: inline', 'align' => 'top', 'width' => 20, 'height' => 20, 'src' => $clip, 'alt' => 'alt'));
-                $this->out->text(')');
-                $this->out->elementEnd('a');
-            } else {
-                $this->out->text(' (');
-                $this->out->element('a', array('href' => $notice->uri), 'see');
-                $this->out->text(')');
-            }
-        }
+        $this->out->elementStart('div', 'entry_content');
+        $nli = new NoticeListItem($notice, $this->out);
+        $nli->showNoticeLink();
+        $this->out->elementEnd('div');
 
-        $this->out->elementEnd('p');
         if (!empty($notice->value)) {
             $this->out->elementStart('p');
             $this->out->text($notice->value);