notice inbox only when not already exists

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

diff --git a/lib/stream.php b/lib/stream.php
index f41c125ca0d96a5e71dff502e28e61c6d8148cd5..ea452096cc937a42b0f14a862b977295b558b221 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,54 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class StreamAction extends Action {
+require_once(INSTALLDIR.'/lib/personal.php');
 
-       function is_readonly() {
-               return true;
-       }
-
-       function handle($args) {
-               parent::handle($args);
-                common_set_returnto($this->self_url());
-       }
-
-       function views_menu() {
-
-               $user = NULL;
-               $action = $this->trimmed('action');
-               $nickname = $this->trimmed('nickname');
-
-               if ($nickname) {
-                       $user = User::staticGet('nickname', $nickname);
-                       $user_profile = $user->getProfile();
-               } else {
-                       $user_profile = false;
-               }
-
-               common_element_start('ul', array('id' => 'nav_views'));
-
-               common_menu_item(common_local_url('all', array('nickname' =>
-                                                                                                          $nickname)),
-                                                _('Personal'),
-                                                sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                                                $action == 'all');
-               common_menu_item(common_local_url('replies', array('nickname' =>
-                                                                                                                         $nickname)),
-                                                _('Replies'),
-                                                sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                                                $action == 'replies');
-               common_menu_item(common_local_url('showstream', array('nickname' =>
-                                                                                                                         $nickname)),
-                                                _('Profile'),
-                                                ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
-                                                $action == 'showstream');
-               common_menu_item(common_local_url('showfavorites', array('nickname' =>
-                                                                                                                         $nickname)),
-                                                _('Favorites'),
-                                                sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
-                                                $action == 'showfavorites');
-               common_element_end('ul');
-       }
+class StreamAction extends PersonalAction {
 
        function show_notice($notice) {
                global $config;
@@ -132,7 +87,7 @@ class StreamAction extends Action {
                common_element_start('a',
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
-                                                                  'onclick' => 'return doreply("'.$profile->nickname.'");',
+                                                                  'onclick' => 'return doreply("'.$profile->nickname.'", '.$notice->id.');',
                                                                   'title' => _('reply'),
                                                                   'class' => 'replybutton'));
                common_raw('→');
@@ -148,27 +103,4 @@ class StreamAction extends Action {
                common_element_end('p');
                common_element_end('li');
        }
-
-       function source_link($source) {
-               $source_name = _($source);
-               switch ($source) {
-                case 'web':
-                case 'xmpp':
-                case 'mail':
-                case 'omb':
-                case 'api':
-                       common_element('span', 'noticesource', $source_name);
-                       break;
-                default:
-                       $ns = Notice_source::staticGet($source);
-                       if ($ns) {
-                               common_element('a', array('href' => $ns->url),
-                                                          $ns->name);
-                       } else {
-                               common_element('span', 'noticesource', $source_name);
-                       }
-                       break;
-               }
-               return;
-       }
 }