Fix to previous fix :(

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

diff --git a/lib/stream.php b/lib/stream.php
index 75734ebc9d0bece9efa0c3294c6b857b5bf83163..ea452096cc937a42b0f14a862b977295b558b221 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,43 +19,88 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
+require_once(INSTALLDIR.'/lib/personal.php');
 
-class StreamAction extends Action {
-
-       function handle($args) {
-               parent::handle($args);
-       }
+class StreamAction extends PersonalAction {
 
        function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
+               $user = common_current_user();
+
                # XXX: RDFa
-               common_element_start('div', array('class' => 'notice',
+               common_element_start('li', array('class' => 'notice_single',
                                                                                  'id' => 'notice-' . $notice->id));
+               if ($user) {
+                       if ($user->hasFave($notice)) {
+                               common_disfavor_form($notice);
+                       } else {
+                               common_favor_form($notice);
+                       }
+               }
                $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-               common_element_start('span', 'floatLeft width25');
                common_element_start('a', array('href' => $profile->profileurl));
-               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
-                                                                       'class' => 'avatar stream floatLeft',
+               common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+                                                                       'class' => 'avatar stream',
                                                                        'width' => AVATAR_STREAM_SIZE,
                                                                        'height' => AVATAR_STREAM_SIZE,
                                                                        'alt' =>
                                                                        ($profile->fullname) ? $profile->fullname :
                                                                        $profile->nickname));
                common_element_end('a');
-               common_element_end('span');
-               common_element_start('span', 'floatRight width75');
                common_element('a', array('href' => $profile->profileurl,
                                                                  'class' => 'nickname'),
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
-               common_element('span', array('class' => 'content'), $notice->content);
+               common_element_start('p', array('class' => 'content'));
+               if ($notice->rendered) {
+                       common_raw($notice->rendered);
+               } else {
+                       # XXX: may be some uncooked notices in the DB,
+                       # we cook them right now. This should probably disappear in future
+                       # versions (>> 0.4.x)
+                       common_raw(common_render_content($notice->content, $notice));
+               }
+               common_element_end('p');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-               common_element('a', array('class' => 'notice',
-                                                                 'href' => $noticeurl),
+               # XXX: we need to figure this out better. Is this right?
+               if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) {
+                       $noticeurl = $notice->uri;
+               }
+               common_element_start('p', 'time');
+               common_element('a', array('class' => 'permalink',
+                                                                 'href' => $noticeurl,
+                                                                 'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               common_element_end('span');
-               common_element_end('div');
+               if ($notice->source) {
+                       common_text(_(' from '));
+                       $this->source_link($notice->source);
+               }
+               if ($notice->reply_to) {
+                       $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+                       common_text(' (');
+                       common_element('a', array('class' => 'inreplyto',
+                                                                         'href' => $replyurl),
+                                                  _('in reply to...'));
+                       common_text(')');
+               }
+               common_element_start('a',
+                                                        array('href' => common_local_url('newnotice',
+                                                                                                                         array('replyto' => $profile->nickname)),
+                                                                  'onclick' => 'return doreply("'.$profile->nickname.'", '.$notice->id.');',
+                                                                  'title' => _('reply'),
+                                                                  'class' => 'replybutton'));
+               common_raw('→');
+               common_element_end('a');
+               if ($user && $notice->profile_id == $user->id) {
+                       $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+                       common_element_start('a', array('class' => 'deletenotice',
+                                                                                       'href' => $deleteurl,
+                                                                                       'title' => _('delete')));
+                       common_raw('×');
+                       common_element_end('a');
+               }
+               common_element_end('p');
+               common_element_end('li');
        }
 }