]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/showstream.php
Fixed routing for direct messages and favorites in the API
[quix0rs-gnu-social.git] / actions / showstream.php
index 60270cfd7cb1514af2ca20f9f0f0dc879eeca8c7..65482167e10d5eda4ce8b40803bff07f845d9156 100644 (file)
@@ -22,6 +22,7 @@
  * @category  Personal
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -33,6 +34,8 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/profileminilist.php';
+require_once INSTALLDIR.'/lib/groupminilist.php';
 require_once INSTALLDIR.'/lib/feedlist.php';
 
 /**
@@ -57,6 +60,11 @@ class ShowstreamAction extends Action
     var $page = null;
     var $profile = null;
 
+    function isReadOnly()
+    {
+        return true;
+    }
+
     function title()
     {
         if ($this->page == 1) {
@@ -102,6 +110,8 @@ class ShowstreamAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -132,65 +142,52 @@ class ShowstreamAction extends Action
 
     function showPageTitle()
     {
-        // Don't show the H1; we have one in the profile block
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('h1', NULL, _("Your profile"));
+        } else {
+            $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname));
+        }
     }
 
-    function showExportData()
+    function showPageNoticeBlock()
     {
-        $fl = new FeedList($this);
-        $fl->show(array(0=>array('href'=>common_local_url('userrss',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'rss',
-                                 'version' => 'RSS 1.0',
-                                 'item' => 'notices'),
-                        1=>array('href'=>common_local_url('usertimeline',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'atom',
-                                 'version' => 'Atom 1.0',
-                                 'item' => 'usertimeline'),
-                        2=>array('href'=>common_local_url('foaf',
-                                                          array('nickname' => $this->user->nickname)),
-                                 'type' => 'rdf',
-                                 'version' => 'FOAF',
-                                 'item' => 'foaf')));
+        return;
     }
 
-    function showFeeds()
+    function getFeeds()
     {
-        // Feeds
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('api',
-                                                                array('apiaction' => 'statuses',
-                                                                      'method' => 'user_timeline.rss',
-                                                                      'argument' => $this->user->nickname)),
-                                     'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
-        $this->element('link', array('rel' => 'alternate feed',
-                                     'href' => common_local_url('api',
-                                                                array('apiaction' => 'statuses',
-                                                                      'method' => 'user_timeline.atom',
-                                                                      'argument' => $this->user->nickname)),
-                                     'type' => 'application/atom+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('userrss', array('nickname' =>
-                                                                               $this->user->nickname)),
-                                     'type' => 'application/rdf+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('userrss',
+                                               array('nickname' => $this->user->nickname)),
+                              sprintf(_('Notice feed for %s (RSS 1.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'user_timeline',
+                                                     'argument' => $this->user->nickname.'.rss')),
+                              sprintf(_('Notice feed for %s (RSS 2.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'user_timeline',
+                                                     'argument' => $this->user->nickname.'.atom')),
+                              sprintf(_('Notice feed for %s (Atom)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::FOAF,
+                              common_local_url('foaf', array('nickname' =>
+                                                             $this->user->nickname)),
+                              sprintf(_('FOAF for %s'), $this->user->nickname)));
     }
 
     function extraHead()
     {
-        // FOAF
-        $this->element('link', array('rel' => 'meta',
-                                     'href' => common_local_url('foaf', array('nickname' =>
-                                                                              $this->user->nickname)),
-                                     'type' => 'application/rdf+xml',
-                                     'title' => 'FOAF'));
         // for remote subscriptions etc.
         $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('xrds', array('nickname' =>
-                                                                               $this->user->nickname))));
+                                                                                 $this->user->nickname))));
 
         if ($this->profile->bio) {
             $this->element('meta', array('name' => 'description',
@@ -219,48 +216,58 @@ class ShowstreamAction extends Action
 
     function showProfile()
     {
-        $this->elementStart('div', array('id' => 'user_profile', 'class' => 'vcard author'));
+        $this->elementStart('div', 'entity_profile vcard author');
         $this->element('h2', null, _('User profile'));
 
         $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $this->elementStart('dl', 'user_depiction');
+        $this->elementStart('dl', 'entity_depiction');
         $this->element('dt', null, _('Photo'));
         $this->elementStart('dd');
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
                                     'class' => 'photo avatar',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $this->profile->nickname));
         $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        if ($this->profile->fullname) {
-            $this->elementStart('dl', 'user_fn');
-            $this->element('dt', null, _('Full name'));
+        $user = User::staticGet('id', $this->profile->id);
+        $cur = common_current_user();
+        if ($cur && $cur->id == $user->id) {
             $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'fn url uid'),
-                           $this->profile->fullname);
+            $this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
             $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
-        $this->elementStart('dl', 'user_nickname');
+        $this->elementEnd('dl');
+
+        $this->elementStart('dl', 'entity_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
-        $this->element('span', 'fn nickname', $this->profile->nickname);
+        $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
+        $this->element('a', array('href' => $this->profile->profileurl,
+                                  'rel' => 'me', 'class' => $hasFN),
+                       $this->profile->nickname);
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
+        if ($this->profile->fullname) {
+            $this->elementStart('dl', 'entity_fn');
+            $this->element('dt', null, _('Full name'));
+            $this->elementStart('dd');
+            $this->element('span', 'fn', $this->profile->fullname);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
+
         if ($this->profile->location) {
-            $this->elementStart('dl', 'user_location');
+            $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
 
         if ($this->profile->homepage) {
-            $this->elementStart('dl', 'user_url');
+            $this->elementStart('dl', 'entity_url');
             $this->element('dt', null, _('URL'));
             $this->elementStart('dd');
             $this->element('a', array('href' => $this->profile->homepage,
@@ -271,7 +278,7 @@ class ShowstreamAction extends Action
         }
 
         if ($this->profile->bio) {
-            $this->elementStart('dl', 'user_note');
+            $this->elementStart('dl', 'entity_note');
             $this->element('dt', null, _('Note'));
             $this->element('dd', 'note', $this->profile->bio);
             $this->elementEnd('dl');
@@ -279,16 +286,17 @@ class ShowstreamAction extends Action
 
         $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
         if (count($tags) > 0) {
-            $this->elementStart('dl', 'user_tags');
+            $this->elementStart('dl', 'entity_tags');
             $this->element('dt', null, _('Tags'));
-            $this->elementStart('dd', 'tags');
+            $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->elementStart('li');
-                $this->element('a', array('rel' => 'tag',
-                                          'href' => common_local_url('peopletag',
-                                                                     array('tag' => $tag))),
-                               $tag);
+                // Avoid space by using raw output.
+                $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
+                      common_local_url('peopletag', array('tag' => $tag)) .
+                      '">' . $tag . '</a>';
+                $this->raw($pt);
                 $this->elementEnd('li');
             }
             $this->elementEnd('ul');
@@ -297,45 +305,66 @@ class ShowstreamAction extends Action
         }
         $this->elementEnd('div');
 
-
-        $this->elementStart('div', array('id' => 'user_actions'));
+        $this->elementStart('div', 'entity_actions');
         $this->element('h2', null, _('User actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('id' => 'user_subscribe'));
         $cur = common_current_user();
+
+        if ($cur && $cur->id == $this->profile->id) {
+            $this->elementStart('li', 'entity_edit');
+            $this->element('a', array('href' => common_local_url('profilesettings'),
+                                      'title' => _('Edit profile settings')),
+                           _('Edit'));
+            $this->elementEnd('li');
+        }
+
         if ($cur) {
             if ($cur->id != $this->profile->id) {
+                $this->elementStart('li', 'entity_subscribe');
                 if ($cur->isSubscribed($this->profile)) {
-                    $sf = new SubscribeForm($this, $this->profile);
-                    $sf->show();
-                } else {
                     $usf = new UnsubscribeForm($this, $this->profile);
                     $usf->show();
+                } else {
+                    $sf = new SubscribeForm($this, $this->profile);
+                    $sf->show();
                 }
+                $this->elementEnd('li');
             }
         } else {
+            $this->elementStart('li', 'entity_subscribe');
             $this->showRemoteSubscribeLink();
+            $this->elementEnd('li');
         }
-        $this->elementEnd('li');
 
-        common_profile_new_message_nudge($cur, $this->user, $this->profile);
+        if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
+            $this->elementStart('li', 'entity_send-a-message');
+            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
+                                      'title' => _('Send a direct message to this user')),
+                           _('Message'));
+            $this->elementEnd('li');
+
+            if ($user->email && $user->emailnotifynudge) {
+                $this->elementStart('li', 'entity_nudge');
+                $nf = new NudgeForm($this, $user);
+                $nf->show();
+                $this->elementEnd('li');
+            }
+        }
 
         if ($cur && $cur->id != $this->profile->id) {
             $blocked = $cur->hasBlocked($this->profile);
-            $this->elementStart('li', array('id' => 'user_block'));
+            $this->elementStart('li', 'entity_block');
             if ($blocked) {
-                $bf = new BlockForm($this, $this->profile);
-                $bf->show();
-            } else {
                 $ubf = new UnblockForm($this, $this->profile);
                 $ubf->show();
+            } else {
+                $bf = new BlockForm($this, $this->profile);
+                $bf->show();
             }
             $this->elementEnd('li');
         }
         $this->elementEnd('ul');
         $this->elementEnd('div');
-
-        $this->elementEnd('div');
     }
 
     function showRemoteSubscribeLink()
@@ -343,7 +372,7 @@ class ShowstreamAction extends Action
         $url = common_local_url('remotesubscribe',
                                 array('nickname' => $this->profile->nickname));
         $this->element('a', array('href' => $url,
-                                  'id' => 'remotesubscribe'),
+                                  'class' => 'entity_remote_subscribe'),
                        _('Subscribe'));
     }
 
@@ -360,76 +389,66 @@ class ShowstreamAction extends Action
 
     function showSections()
     {
-        $this->showStatistics();
         $this->showSubscriptions();
+        $this->showSubscribers();
+        $this->showGroups();
+        $this->showStatistics();
+        $cloud = new PersonalTagCloudSection($this, $this->user);
+        $cloud->show();
     }
 
     function showSubscriptions()
     {
-        $subs = new Subscription();
-        $subs->subscriber = $this->profile->id;
-        $subs->whereAdd('subscribed != ' . $this->profile->id);
-
-        $subs->orderBy('created DESC');
-
-        // We ask for an extra one to know if we need to do another page
-
-        $subs->limit(0, SUBSCRIPTIONS + 1);
-
-        $subs_count = $subs->find();
+        $profile = $this->user->getSubscriptions(0, PROFILES_PER_MINILIST + 1);
 
-        $this->elementStart('div', array('id' => 'subscriptions',
+        $this->elementStart('div', array('id' => 'entity_subscriptions',
                                          'class' => 'section'));
 
         $this->element('h2', null, _('Subscriptions'));
 
-        if ($subs_count > 0) {
+        if ($profile) {
+            $pml = new ProfileMiniList($profile, $this->user, $this);
+            $cnt = $pml->show();
+            if ($cnt == 0) {
+                $this->element('p', null, _('(None)'));
+            }
+        }
 
-            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
+        if ($cnt > PROFILES_PER_MINILIST) {
+            $this->elementStart('p');
+            $this->element('a', array('href' => common_local_url('subscriptions',
+                                                                 array('nickname' => $this->profile->nickname)),
+                                      'class' => 'more'),
+                           _('All subscriptions'));
+            $this->elementEnd('p');
+        }
 
-            for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
+        $this->elementEnd('div');
+    }
 
-                if (!$subs->fetch()) {
-                    common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
-                    break;
-                }
+    function showSubscribers()
+    {
+        $profile = $this->user->getSubscribers(0, PROFILES_PER_MINILIST + 1);
 
-                $other = Profile::staticGet($subs->subscribed);
+        $this->elementStart('div', array('id' => 'entity_subscribers',
+                                         'class' => 'section'));
 
-                if (!$other) {
-                    common_log_db_error($subs, 'SELECT', __FILE__);
-                    continue;
-                }
+        $this->element('h2', null, _('Subscribers'));
 
-                $this->elementStart('li', 'vcard');
-                $this->elementStart('a', array('title' => ($other->fullname) ?
-                                                $other->fullname :
-                                                $other->nickname,
-                                                'href' => $other->profileurl,
-                                                'rel' => 'contact',
-                                                 'class' => 'subscription fn url'));
-                $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-                $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
-                                            'width' => AVATAR_MINI_SIZE,
-                                            'height' => AVATAR_MINI_SIZE,
-                                            'class' => 'avatar mini photo',
-                                            'alt' =>  ($other->fullname) ?
-                                            $other->fullname :
-                                            $other->nickname));
-                $this->elementEnd('a');
-                $this->elementEnd('li');
+        if ($profile) {
+            $pml = new ProfileMiniList($profile, $this->user, $this);
+            $cnt = $pml->show();
+            if ($cnt == 0) {
+                $this->element('p', null, _('(None)'));
             }
-
-            $this->elementEnd('ul');
         }
 
-        if ($subs_count > SUBSCRIPTIONS) {
-            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
-
-            $this->element('a', array('href' => common_local_url('subscriptions',
+        if ($cnt > PROFILES_PER_MINILIST) {
+            $this->elementStart('p');
+            $this->element('a', array('href' => common_local_url('subscribers',
                                                                  array('nickname' => $this->profile->nickname)),
-                                      'class' => 'moresubscriptions'),
-                           _('All subscriptions'));
+                                      'class' => 'more'),
+                           _('All subscribers'));
             $this->elementEnd('p');
         }
 
@@ -451,33 +470,81 @@ class ShowstreamAction extends Action
         $notices->profile_id = $this->profile->id;
         $notice_count = (int) $notices->count();
 
-        $this->elementStart('div', array('id' => 'statistics',
+        $this->elementStart('div', array('id' => 'entity_statistics',
                                          'class' => 'section'));
 
-        $this->element('h2', 'statistics', _('Statistics'));
+        $this->element('h2', null, _('Statistics'));
 
         // Other stats...?
-        $this->elementStart('dl', 'statistics');
-        $this->element('dt', 'membersince', _('Member since'));
-        $this->element('dd', 'membersince', date('j M Y',
-                                                 strtotime($this->profile->created)));
+        $this->elementStart('dl', 'entity_member-since');
+        $this->element('dt', null, _('Member since'));
+        $this->element('dd', null, date('j M Y',
+                                        strtotime($this->profile->created)));
+        $this->elementEnd('dl');
 
-        $this->elementStart('dt', 'subscriptions');
+        $this->elementStart('dl', 'entity_subscriptions');
+        $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscriptions',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscriptions'));
         $this->elementEnd('dt');
-        $this->element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
-        $this->elementStart('dt', 'subscribers');
+        $this->element('dd', null, (is_int($subs_count)) ? $subs_count : '0');
+        $this->elementEnd('dl');
+
+        $this->elementStart('dl', 'entity_subscribers');
+        $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscribers',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscribers'));
         $this->elementEnd('dt');
         $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
-        $this->element('dt', 'notices', _('Notices'));
-        $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
         $this->elementEnd('dl');
 
+        $this->elementStart('dl', 'entity_notices');
+        $this->element('dt', null, _('Notices'));
+        $this->element('dd', null, (is_int($notice_count)) ? $notice_count : '0');
+        $this->elementEnd('dl');
+
+        $this->elementEnd('div');
+    }
+
+    function showGroups()
+    {
+        $groups = $this->user->getGroups(0, GROUPS_PER_MINILIST + 1);
+
+        $this->elementStart('div', array('id' => 'entity_groups',
+                                         'class' => 'section'));
+
+        $this->element('h2', null, _('Groups'));
+
+        if ($groups) {
+            $gml = new GroupMiniList($groups, $this->user, $this);
+            $cnt = $gml->show();
+            if ($cnt == 0) {
+                $this->element('p', null, _('(None)'));
+            }
+        }
+
+        if ($cnt > GROUPS_PER_MINILIST) {
+            $this->elementStart('p');
+            $this->element('a', array('href' => common_local_url('usergroups',
+                                                                 array('nickname' => $this->profile->nickname)),
+                                      'class' => 'more'),
+                           _('All groups'));
+            $this->elementEnd('p');
+        }
+
+        $this->elementEnd('div');
+    }
+
+    function showAnonymousMessage()
+    {
+               $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+                       'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
+                       '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
+                     $this->user->nickname, $this->user->nickname);
+        $this->elementStart('div', array('id' => 'anon_notice'));
+        $this->raw(common_markup_to_html($m));
         $this->elementEnd('div');
     }