correct a couple of bugs

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

diff --git a/lib/stream.php b/lib/stream.php
index ad65e2d2a293702231a513b0959225d68f1dd4da..8a2c1e9b08f9b7d481747033a811d2f4c5b20898 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,50 +19,25 @@
 
 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);
-       }
-
-       function views_menu() {
-
-               $user = NULL;
-               $action = $this->trimmed('action');
-               $nickname = $this->trimmed('nickname');
-
-               if ($nickname) {
-                       $user = User::staticGet('nickname', $nickname);
-               }
-
-               common_element_start('ul', array('id' => 'nav_views'));
-
-               common_menu_item(common_local_url('all', array('nickname' =>
-                                                                                                          $nickname)),
-                                                _('Personal'),
-                                                sprintf(_('%s and friends'), (($user && $user->fullname) ? $user->fullname : $nickname)),
-                                                $action == 'all');
-               common_menu_item(common_local_url('replies', array('nickname' =>
-                                                                                                                         $nickname)),
-                                                _('Replies'),
-                                                sprintf(_('Replies to %s'), (($user && $user->fullname) ? $user->fullname : $nickname)),
-                                                $action == 'replies');
-               common_menu_item(common_local_url('showstream', array('nickname' =>
-                                                                                                                         $nickname)),
-                                                _('Profile'),
-                                                ($user && $user->fullname) ? $user->fullname : $nickname,
-                                                $action == 'showstream');
-               common_element_end('ul');
-       }
+class StreamAction extends PersonalAction {
 
        function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
+               $user = common_current_user();
+
                # XXX: RDFa
                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('a', array('href' => $profile->profileurl));
                common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
@@ -88,11 +63,19 @@ class StreamAction extends Action {
                }
                common_element_end('p');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+               # 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));
+               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(' (');
@@ -104,11 +87,19 @@ class StreamAction extends Action {
                common_element_start('a',
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
-                                                                  'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+                                                                  'onclick' => 'return doreply("'.$profile->nickname.'");',
                                                                   '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');
        }